From 362c0810204606f2127d2f0db3e4a7b4b3250091 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 18 Dec 2019 16:22:15 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=86=85=E9=83=A8=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/kyc/core/impls/KycServiceImpl.java | 10 ++++----
 .../core/impls/SignInAccountServiceImpl.java  |  4 +++-
 .../manage/signin/web/SignInController.java   | 24 ++++++++-----------
 .../templates/bd_help_client_progress.html    |  5 ++--
 .../templates/client_kyc_files_progress.html  | 14 ++++++-----
 .../kyc/templates/partner_kyc_files.html      |  8 +++----
 .../templates/compliance_files_advice.html    | 24 +++++++++----------
 7 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java
index 96a0e740c..6a5785917 100644
--- a/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java
@@ -145,20 +145,20 @@ public class KycServiceImpl implements KycService {
                     if (mpWechatApi == null) {
                         return;
                     }
-                    String templateId = mpWechatApi.getTemplateId("payment-success-cashier");
+                    String templateId = mpWechatApi.getTemplateId("commission");
                     if (templateId == null) {
                         return;
                     }
                     TemplateMessage message = new TemplateMessage(openId, templateId, null);
                     message.put("first", "有新商户需要您协助补充KYC材料,请尽快查看", "#ff0000");
-                    message.put("keyword1", "KYC认证商户申请协助", "#0000ff");
-                    message.put("keyword2", client.getString("company_name"), "#000000");
+                    message.put("keyword1", "KYC认证", "#0000ff");
+                    message.put("keyword2", client.getString("company_name")+"("+client.getString("client_moniker")+")", "#000000");
                     message.put("keyword3", DateFormatUtils.format(complianceInfo.getDate("submit_time"),"yyyy-MM-dd HH:mm:ss"), "#000000");
                     message.put("keyword4", "联系人：" + client.getString("contact_person") + " 电话:" + client.getString("contact_phone"), "#000000");
-                    message.put("remark", "您可以在后台帮助商户提交材料或填写无法提供材料文件的原因", "#ff0000");
+                    message.put("remark",  "您可以在后台帮助商户提交材料或填写无法提供材料文件的原因", "#ff0000");
                     mpWechatApi.sendTemplateMessage(message);
                 } catch (Exception e) {
-                    logger.error("cashier message failed", e);
+                    logger.error("notify bdhelp message failed:", e);
                 }
             }
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index fad677dc1..abb96f9bf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -751,7 +751,9 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         JSONObject result = new JSONObject();
         boolean lessKycFiles = true;
         JSONObject kycFilesAuth = clientComplianceCompanyMapper.findKycFileComplete(client.getIntValue("client_id"));
-        if(kycFilesAuth != null){
+        if(kycFilesAuth != null
+                || !("PINE".equals(client.getString("client_moniker"))
+                || "LEOH".equals(client.getString("client_moniker")))){
             lessKycFiles = false;
         }
         result.put("client_less_file", lessKycFiles);
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
index 5f5fb0edb..b100a9380 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
@@ -1,44 +1,39 @@
 package au.com.royalpay.payment.manage.signin.web;
 
-import au.com.royalpay.payment.manage.merchants.core.ClientManager;
-import au.com.royalpay.payment.manage.signin.core.*;
-import au.com.royalpay.payment.tools.permission.consumer.ConsumersAction;
-import com.google.code.kaptcha.Producer;
-
 import au.com.royalpay.payment.manage.customers.core.CustomerPaymentInfoService;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.permission.manager.PartnerMapping;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.beans.FindPwdBean;
 import au.com.royalpay.payment.manage.signin.beans.LoginInfo;
 import au.com.royalpay.payment.manage.signin.beans.TodoNotice;
+import au.com.royalpay.payment.manage.signin.core.*;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
-import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
+import au.com.royalpay.payment.tools.permission.consumer.ConsumersAction;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
-
 import com.alibaba.fastjson.JSONObject;
-
+import com.google.code.kaptcha.Producer;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by yixian on 2016-06-29.
@@ -191,7 +186,8 @@ public class SignInController {
     @PartnerMapping(value = "/current_partner", method = RequestMethod.GET)
     public JSONObject partnerLoginStatus(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
         partner.put("has_incremental_setvice",clientManager.partnerIncrementalService(partner.getString("client_moniker")).getJSONArray("all_service").size()>0);
-        partner.put("lessKycFiles",clientManager.isPartnerKycfilesComplete(partner.getString("client_moniker")));
+        boolean lessKycFiles = ("PINE".equals(partner.getString("client_moniker")) || "LEOH".equals(partner.getString("client_moniker")))  && clientManager.isPartnerKycfilesComplete(partner.getString("client_moniker"));
+        partner.put("lessKycFiles", lessKycFiles);
         partner.put("lessComplianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")).getBoolean("client_less_file") );
         return partner;
     }
diff --git a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html
index 8f1a2c43c..2736ff62a 100644
--- a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html
+++ b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html
@@ -95,8 +95,9 @@
                                                 <option value="driver_license">Driver's license</option>
                                             </select>
                                             <p class="text-info">
-                                                <i class="fa fa-info"></i> If client have already attached surcharge in their own system, ignore this choice.<br>
-                                                <i class="fa fa-info"></i> It is recommended to notice customers about they will pay addition money as surcharge in the payment page. <br>
+                                                <i class="fa fa-info"></i> Please select the file type for uploading the ID.<br>
+                                                <i class="fa fa-info"></i> Uploading your passport file requires you to upload your utility bill file. <br>
+                                                <i class="fa fa-info"></i> You can upload your driver's license and leave the utility bill file blank. <br>
                                                 <i class="fa fa-info"></i> 请选择上传ID的文件类型.<br>
                                                 <i class="fa fa-info"></i> 上传护照文件需要您上传水电煤账单文件.<br>
                                                 <i class="fa fa-info"></i> 上传驾照,水电煤账单文件可以不填.
diff --git a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html
index 69d92bc6c..7a7948300 100644
--- a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html
+++ b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html
@@ -37,7 +37,8 @@
                 </div>
                 <uib-progressbar value="bankFileProgress.value" ng-if="bankFileProgress"></uib-progressbar>
                 <a ng-if="bankIsImage" target="_blank" ng-href="{{file.client_bank_file}}">
-                    <img class="col-sm-6" style="border: 1px solid #ddd" ng-src="{{file.client_bank_file}}"
+                    <img ng-if="file.client_bank_file"
+                         class="col-sm-6" style="border: 1px solid #ddd" ng-src="{{file.client_bank_file}}"
                          class="col-sm-8"
                          onerror="this.src='/static/images/file_close.png'"></a>
             </div>
@@ -61,8 +62,9 @@
                         <option value="driver_license">Driver's license</option>
                     </select>
                     <p class="text-info">
-                        <i class="fa fa-info"></i> If client have already attached surcharge in their own system, ignore this choice.<br>
-                        <i class="fa fa-info"></i> It is recommended to notice customers about they will pay addition money as surcharge in the payment page. <br>
+                        <i class="fa fa-info"></i> Please select the file type for uploading the ID.<br>
+                        <i class="fa fa-info"></i> Uploading your passport file requires you to upload your utility bill file. <br>
+                        <i class="fa fa-info"></i> You can upload your driver's license and leave the utility bill file blank. <br>
                         <i class="fa fa-info"></i> 请选择上传ID的文件类型.<br>
                         <i class="fa fa-info"></i> 上传护照文件需要您上传水电煤账单文件.<br>
                         <i class="fa fa-info"></i> 上传驾照,水电煤账单文件可以不填.
@@ -82,7 +84,8 @@
                 </div>
                 <uib-progressbar value="idFileProgress.value" ng-if="idFileProgress"></uib-progressbar>
                 <a ng-if="bankIsImage" target="_blank" ng-href="{{file.client_id_file}}">
-                    <img class="col-sm-6" style="border: 1px solid #ddd" ng-src="{{file.client_id_file}}"
+                    <img ng-if="file.client_id_file"
+                            class="col-sm-6" style="border: 1px solid #ddd" ng-src="{{file.client_id_file}}"
                          class="col-sm-8"
                          onerror="this.src='/static/images/file_close.png'"></a>
             </div>
@@ -149,10 +152,9 @@
             <button style="width: 30%;height: 50px;font-size: 20px;margin-top: 40px;margin-bottom: 20px;" class="btn-group btn btn-success" type="button"
                     ng-click="clientComplianceViewCommit()">Submit Files
             </button>
-            <button style="width: 10%;height: 50px;font-size: 20px;margin-top: 40px;margin-bottom: 20px;" class="btn-group btn btn-warning" type="button"
+            <button style="width: 10%;height: 50px;font-size: 15px;margin-top: 40px;margin-bottom: 20px;" class="btn-group btn btn-warning" type="button"
                     ng-click="needBDIntervention()">Notify BD Help
             </button>
-<!--            对补充材料有疑问，需要BD介入帮助,如果需要BD介入帮助，上述材料可不填-->
         </div>
     </div>
 </div>
diff --git a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html
index 3e05f8a4b..d218c0b10 100644
--- a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html
+++ b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html
@@ -7,10 +7,10 @@
     <div class="panel-heading">KYC Files &nbsp;&nbsp;&nbsp;
         <span ng-if="!file.companyFile">(未提交)</span>
         <span ng-if="file.companyFile">
-            <span ng-if="file.companyFile.status == 9">(bd帮助)</span>
-            <span ng-if="file.companyFile.status == 0">(待审核)</span>
-            <span ng-if="file.companyFile.status == 1">(已通过)</span>
-            <span ng-if="file.companyFile.status == 2">(已打回)</span>
+           <b><span ng-if="file.companyFile.status == 9" style="color: red">(BD帮助)</span></b>
+           <b> <span ng-if="file.companyFile.status == 0" style="color: orange">(待审核)</span></b>
+           <b> <span ng-if="file.companyFile.status == 1" style="color: green">(已通过)</span></b>
+           <b> <span ng-if="file.companyFile.status == 2" style="color: red;">(已打回)</span></b>
         </span>
         <!--<a class="btn-group btn btn-success" ng-if="file" ng-href="{{downloadAsZip()}}" target="_blank">
             <i class="fa fa-cloud-download">一键下载</i>
diff --git a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html
index c72cadc03..c0023fb55 100644
--- a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html
+++ b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html
@@ -1,6 +1,6 @@
 <style>
     .selectedLanguage{
-        background:#FF9;color:red;
+        color:#f06101;
     }
 
 </style>
@@ -32,8 +32,7 @@
                         </p>
                         <p><span style="font-family: DengXian; font-size: 14px;">Dear RoyalPay Merchants:</span></p>
                         <p class="p1">RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this
-                            we regularly participate in communication with Austrac and China&#39;s Foreign Exchange Regulator. To ensure
-                            your business is fully compliant, we require certain documents from you by the 31st of October. If you believe
+                            we regularly participate in communication with Austrac and China&#39;s Foreign Exchange Regulator. If you believe
                             you may not be able to submit these documents on time please get in touch with us as soon as possible.</p>
                         <p><br/><span style="font-family: DengXian; font-size: 14px;"></span></p>
                         <p><span
@@ -54,8 +53,7 @@
                         <p style="text-align: center;"><span style="font-family: DengXian; font-size: 14px;">RoyalPay皇家支付商户文件补充通知</span>
                         </p>
                         <p><span style="font-family: DengXian; font-size: 14px;">尊敬的RoyalPay商户：</span></p>
-                        <p class="p1">应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月31日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。</p>
-                        <p class="p1">商户正在申请kyc，截止时间2019年10月31日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。</p>
+                        <p class="p1">应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，超期未提交将可能会影响您的正常交易，谢谢您的配合。</p>
                         <p class="p1"><br/><span style="font-family: DengXian; font-size: 14px;"></span></p>
                         <p><span style="font-family: DengXian; font-size: 14px;">RoyalPay客服与技术支持在此期间将竭诚为您服务，如有疑问或需帮助，请拨打我们的客服电话：1300 107 750或添加RoyalPay官方客服号：royalpay_</span><span
                                 style="font-family: DengXian; font-size: 14px;">1</span><span
@@ -83,7 +81,7 @@
             <tbody>
             <tr ng-if="file.client_less_file">
                 <td>Supplement Compliance File</td>
-                <td>Deadline 2020-01-20</td>
+                <td>2020-01-31</td>
                 <td>
                     <p ng-if="file.file_company" style="color: red">
                         <span ng-if="file.file_company.status == 2">Refused</span>
@@ -93,11 +91,11 @@
                         <span>Not Submitted</span>
                     </p>
                 </td>
-                <td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">Go to replenish></a></p></td>
+                <td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">Go to replenish>></a></p></td>
             </tr>
             <tr ng-if="kycFile.client_less_file">
                 <td>KYC Certification Information Supplement</td>
-                <td>Deadline 2020-01-20</td>
+                <td>2020-01-31</td>
                 <td>
                     <p ng-if="kycFile.file_company" style="color: red">
                         <span ng-if="kycFile.file_company.status == 2">Refused</span>
@@ -107,7 +105,7 @@
                         <span>Not Submitted</span>
                     </p>
                 </td>
-                <td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">Go to replenish></a></p></td>
+                <td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">Go to replenish>></a></p></td>
             </tr>
             </tbody>
         </table>
@@ -128,7 +126,7 @@
             <tbody>
             <tr ng-if="file.client_less_file">
                 <td>合规资料补充</td>
-                <td>截止时间 2020-01-20</td>
+                <td>2020-01-31</td>
                 <td>
                     <p ng-if="file.file_company" style="color: red">
                     <span ng-if="file.file_company.status == 2">打回</span>
@@ -138,11 +136,11 @@
                         <span>未提交</span>
                     </p>
                 </td>
-                <td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">前往补充></a></p></td>
+                <td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">前往补充>></a></p></td>
             </tr>
             <tr ng-if="kycFile.client_less_file">
                 <td>KYC认证资料补充</td>
-                <td>截止时间 2020-01-20</td>
+                <td>2020-01-31</td>
                 <td>
                     <p ng-if="kycFile.file_company" style="color: red">
                         <span ng-if="kycFile.file_company.status == 2">打回</span>
@@ -152,7 +150,7 @@
                         <span>未提交</span>
                     </p>
                 </td>
-                <td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">前往补充></a></p></td>
+                <td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">前往补充>></a></p></td>
             </tr>
             </tbody>
         </table>