From 1643d25ed2295ca740385757fc9cb7ca6250832e Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Tue, 28 Apr 2020 19:59:04 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=A1=E7=94=A8=E5=8D=A1=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ClientManagerImpl.java         |  4 ++-
 .../manage/mappers/system/ClientMapper.xml    |  7 ++--
 .../partner/templates/partner_detail.html     | 13 +++-----
 .../payment/partner/templates/partners.html   | 32 ++++++++++---------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git 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
index 6b667a1ad..2c0dda9b0 100644
--- 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
@@ -466,7 +466,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 client.put("show_all_permission", checkBDPermission > 0);
                 if (checkBDPermission > 0) {
                     JSONObject org = orgMapper.findOne(manager.getIntValue("org_id"));
-                    boolean bdRateEditable = client.getIntValue("approve_result") != 1 || org.getBooleanValue("rate_editable");
+                    boolean bdRateEditable = client.getIntValue("approve_result") != 1 ||
+                            (client.getIntValue("upay_approve_result") !=1 && !client.containsKey("upay_approve_result") && client.getIntValue("upay_approve_result") !=4)
+                            || org.getBooleanValue("rate_editable");
                     client.put("rate_editable", bdRateEditable);
                 } else {
                     client.put("company_phone", "******");
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index dbdfc3ffb..c3d60cc83 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -44,10 +44,13 @@
         scup.upay_approve_time,
         scup.upay_refuse_remark,
         scup.upay_approve_email_send,
-        scup.upay_approve_email_id
+        scup.upay_approve_email_id,
+        config.enable_cross_payment,
+        config.enable_card_payment
         FROM sys_clients c
         inner join sys_client_config cc on cc.client_id = c.client_id
         inner join sys_org o on o.org_id=c.org_id
+        inner join sys_client_config config on c.client_id = config.client_id
         left join sys_client_upay_profile scup on scup.client_id = c.client_id
         <if test="bd_user!=null">
             INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
@@ -417,7 +420,7 @@
         from sys_clients
     </select>
     <select id="listPartnerSelection" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT c.*,o.name org_name FROM sys_clients c
+        SELECT c.*,o.name org_nameFROM sys_clients c
         inner join sys_org o on o.org_id=c.org_id
         <if test="bd_user!=null">
             INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 5a7e44e87..ce2e83288 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -264,13 +264,10 @@
             </button>
         </div>
         <div class="box-body" ng-if="partner.is_valid==1">
-            <div style="margin-bottom: 5px" ng-if="partner.upay_open_status != 5">
-                <a role="button" type="button" class="btn btn-success" ng-click="exportCardAgreegatePDF()">
-                    制作信用卡支付合同</a>
-                <a ng-if="letterOfOfferFileManager.letter_of_offer_file" role="button" type="button" class="btn btn-success" ng-click="exportCardPromotionaAgreegatePDF()">
-                    制作促销合同</a>
-            </div>
-
+            <a ng-if="partner.upay_open_status != 5" role="button" type="button" class="btn btn-success" ng-click="exportCardAgreegatePDF()">
+                制作信用卡支付合同</a>
+            <a ng-if="partner.upay_open_status != 5 &&letterOfOfferFileManager.letter_of_offer_file" role="button" type="button" class="btn btn-success" ng-click="exportCardPromotionaAgreegatePDF()">
+                制作促销合同</a>
             <div class="btn-group pull-right" role="group" aria-label="...">
                 <button type="button" ng-if="partner.upay_open_status==1 && partner.upay_approve_result>1 || partner.upay_open_status==4"
                         class="btn btn-success" ng-click="passCardClient()">Pass
@@ -1300,7 +1297,7 @@
                     </div>
 
                     <div style="text-align: center">
-                        <a role="button" style="margin-bottom: 25px;float: left;"  class="btn btn-danger btn-sm ng-scope" ng-click="deleteClient()">Destroy</a>
+                        <a role="button" style="margin-bottom: 25px;"  class="btn btn-danger btn-sm ng-scope" ng-click="deleteClient()">Destroy</a>
                         <a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope"
                            ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
                     </div>
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index f2f38480f..5d2879422 100644
--- a/src/main/ui/static/payment/partner/templates/partners.html
+++ b/src/main/ui/static/payment/partner/templates/partners.html
@@ -487,7 +487,7 @@
                                     <td ng-bind="partner.sub_merchant_id"></td>
                                     <td ng-bind="partner.create_time"></td>
                                     <td class="row">
-                                        <div class="col-xs-4" style="padding-left: 0;padding-right: 0" ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}">
+                                        <div ng-if="partner.enable_cross_payment" class="col-xs-4" style="padding-left: 0;padding-right: 0" ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}">
                                             <img height="20px" src="/static/images/royalpay_sign_s.png">
                                             <span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span>
                                             <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span>
@@ -503,20 +503,22 @@
                                             <span ng-if="partner.approve_result==4 && !partner.open_status"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
                                         </div>
 
-                                        <div ng-if="!partner.upay_approve_result" class="col-xs-4" style="padding-left: 0;padding-right: 0">
-                                            <img height="20px" src="/static/images/card_payment_sign.png"><span> 资料完善中</span>
-                                        </div>
-                                        <div ng-if="partner.upay_approve_result" style="padding-left: 0;padding-right: 0" class="col-xs-4" style="margin-left: 2px"  ng-class="{'bg-green':(partner.upay_approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.upay_open_status==1||partner.upay_open_status==2||partner.upay_open_status==4) && partner.upay_approve_result!=3)||(partner.upay_approve_result==3 && (!partner.upay_open_status || partner.upay_open_status==1 || partner.upay_open_status == 4))||(partner.upay_approve_result==4 && !partner.upay_open_status)}">
-                                            <img height="20px" src="/static/images/card_payment_sign.png">
-                                            <span ng-if="partner.upay_approve_result==1 && partner.upay_approve_time">通过({{partner.upay_approve_time}})</span>
-                                            <span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source!=4">资料完善中</span>
-                                            <span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
-                                            <span ng-if="partner.upay_approve_result==0 && partner.upay_approve_time">不通过({{partner.upay_approve_time}})</span>
-                                            <span ng-if="partner.upay_approve_result==5">申请打回({{partner.upay_refuse_remark|limitTo:15}})</span>
-                                            <span ng-if="(partner.upay_open_status==1||partner.upay_open_status==4)"><i ng-if="partner.upay_refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
-                                            <span ng-if="partner.upay_open_status==2">合同制作完成</span>
-                                            <span ng-if="partner.upay_open_status==3 && partner.upay_approve_result!=5">等待BD上传材料审核</span>
-                                            <span ng-if="partner.upay_approve_result==4 && !partner.upay_open_status"><i ng-if="partner.upay_refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                        <div ng-if="partner.enable_card_payment">
+                                            <div ng-if="!partner.upay_approve_result" class="col-xs-4" style="padding-left: 0;padding-right: 0">
+                                                <img height="20px" src="/static/images/card_payment_sign.png"><span> 资料完善中</span>
+                                            </div>
+                                            <div ng-if="partner.upay_approve_result" style="padding-left: 0;padding-right: 0" class="col-xs-4" style="margin-left: 2px"  ng-class="{'bg-green':(partner.upay_approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.upay_open_status==1||partner.upay_open_status==2||partner.upay_open_status==4) && partner.upay_approve_result!=3)||(partner.upay_approve_result==3 && (!partner.upay_open_status || partner.upay_open_status==1 || partner.upay_open_status == 4))||(partner.upay_approve_result==4 && !partner.upay_open_status)}">
+                                                <img height="20px" src="/static/images/card_payment_sign.png">
+                                                <span ng-if="partner.upay_approve_result==1 && partner.upay_approve_time">通过({{partner.upay_approve_time}})</span>
+                                                <span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source!=4">资料完善中</span>
+                                                <span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
+                                                <span ng-if="partner.upay_approve_result==0 && partner.upay_approve_time">不通过({{partner.upay_approve_time}})</span>
+                                                <span ng-if="partner.upay_approve_result==5">申请打回({{partner.upay_refuse_remark|limitTo:15}})</span>
+                                                <span ng-if="(partner.upay_open_status==1||partner.upay_open_status==4)"><i ng-if="partner.upay_refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                                <span ng-if="partner.upay_open_status==2">合同制作完成</span>
+                                                <span ng-if="partner.upay_open_status==3 && partner.upay_approve_result!=5">等待BD上传材料审核</span>
+                                                <span ng-if="partner.upay_approve_result==4 && !partner.upay_open_status"><i ng-if="partner.upay_refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                            </div>
                                         </div>
                                     </td>
                                     <td ng-bind="partner.org_name"></td>