Merge branch 'develop'

# Conflicts: # src/db/modify.sql
7 years ago · 6df34df759
parent c4324f1407 e234e5745f
commit 6df34df759
5 changed files with 44 additions and 7 deletions
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@ -239,5 +239,25 @@ ALTER TABLE `financial_bd_prize_log`
  MODIFY COLUMN `manager_id`  varchar(50) NOT NULL COMMENT 'bd user id' AFTER `record_id`;


-alter table sys_notice
-	add is_app_window tinyint default '0' null comment '是否需要APP弹框';
+
+
+
+ALTER TABLE sys_files DROP INDEX UK_sys_files;
+
+create table sys_clients_contract(
+id varchar(50) not null,
+client_id int(11) not null,
+create_time datetime not null,
+expiry_date date not null,
+has_sign TINYINT(1) DEFAULT 0 not null,
+sign_channel varchar(10) not null ,
+sign_account_id varchar(50) DEFAULT null,
+signatory varchar(20) DEFAULT null,
+PRIMARY key (`id`)
+);
+
+
+alter table sys_clients_devices add column is_offline  tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `sys_customer_relation`
+ADD COLUMN `globalpay_openid`  varchar(100) NULL AFTER `kanga_openid`;
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@ -734,6 +734,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
        ctx.setVariable("client_moniker", client.getString("client_moniker"));
        ctx.setVariable("contact_person", client.getString("contact_person"));
        ctx.setVariable("credential_code", client.getString("credential_code"));
+        ctx.setVariable("short_name", client.getString("short_name"));
        final String content = thymeleaf.process("mail/new_client_notice", ctx);
        // final String content = VelocityEngineUtils.mergeTemplateIntoString(null, "mail/new_client_notice.vm",
        // "utf-8", model);
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@ -158,6 +158,14 @@ public class ClientContractServiceImpl implements ClientContractService {
        if (client == null) {
            throw new NotFoundException("merchant not found please check ID");
        }
+        JSONObject sysconfig = sysConfigManager.getSysConfig();
+        JSONObject defaultResult = new JSONObject();
+        defaultResult.put("rate_expire", false);
+        defaultResult.put("rate_waring", false);
+        defaultResult.put("old_contract",false);
+        if (sysconfig!=null && !sysconfig.getBoolean("sys_new_contract_on")) {
+            return defaultResult;
+        }
        List<JSONObject> rateInfo = clientRateMapper.minExpiryTime(client_id, null);
        JSONObject result = new JSONObject();
        if (CollectionUtils.isEmpty(rateInfo)) {
--- a/src/main/resources/templates/mail/new_client_notice.html
+++ b/src/main/resources/templates/mail/new_client_notice.html
@ -1,5 +1,5 @@
 <html xmlns:th="http://www.thymeleaf.org" lang="zh">
-<h4>Dear Merchant :</h4>
+<h4>Dear <span th:text="${short_name}"></span> :</h4>
 <p>I'm happy to let you know that your RoyalPay Cross-border Payment account has been set up.<br>
    很高兴通知您，贵司RoyalPay跨境全支付已经开通</p>

@ -33,9 +33,17 @@
 </ul>
 <p>Please find the User Guide here :<a
        href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf" target="_blank">User
-    Guide</a></p>
+    Guide for PC</a> or
+    <a
+            href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf" target="_blank">User
+        Guide for APP</a>
+</p>
 <p>您可以点击链接下载用户手册:<a href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf"
-                    target="_blank">用户手册</a></p>
+                    target="_blank">PC用户手册</a> 、
+    <a href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf"
+       target="_blank">APP用户手册</a>
+</p>
+
 <p>(If you cannot open the link above, you can copy and paste this url to your browser.
    如果您无法点击上面的链接，可以复制当前url到浏览器地址栏
    <b>https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf</b>)</p>
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html
@ -1,11 +1,11 @@
 <div is-open="ctrl.viewyear">
    <ul id="myTab" class="nav nav-tabs">
        <li ui-sref-active="active">
-            <a ui-sref=".org" data-toggle="tab">
+            <a ui-sref=".org">
                合伙人提成
            </a>
        </li>
-        <li ui-sref-active="active"><a ui-sref=".referrer" data-toggle="tab">推荐人提成</a></li>
+        <li ui-sref-active="active"><a ui-sref=".referrer">推荐人提成</a></li>
    </ul>
    <div class="tab-content" ui-view>