From 7595fbd293629db0ed9632bf043a817e9030108a Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 29 May 2020 15:41:50 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=95=86=E6=88=B7=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BB=A5=E5=8F=8A=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../manage/merchants/beans/PartnerQuery.java  | 27 +++++
 .../manage/mappers/system/ClientMapper.xml    | 99 ++++++++++++-------
 .../static/payment/partner/partner-manage.js  | 24 ++++-
 .../partner/templates/partner_compliance.html | 99 +++++++++++--------
 5 files changed, 172 insertions(+), 79 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e44bcf15..3e694a141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.19</version>
+    <version>2.3.20</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java
index 4f2503bbd..323861852 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java
@@ -53,6 +53,10 @@ public class PartnerQuery {
     private String merchant_id;
     private boolean card_approving = false;
 
+    //审核商户查询进件分类（跨境/卡支付）
+    private boolean cross_approving_flag= false;
+    private boolean card_approving_flag = false;
+
     public String getClient_moniker() {
         return StringUtils.isEmpty(client_moniker) ? null : client_moniker;
     }
@@ -124,6 +128,12 @@ public class PartnerQuery {
         if(card_approving){
             param.put("card_approving",true);
         }
+        if(cross_approving_flag){
+            param.put("cross_approving_flag", true);
+        }
+        if(card_approving_flag){
+            param.put("card_approving_flag", true);
+        }
         if (org_id != null) {
             param.put("org_id", org_id);
         }
@@ -484,4 +494,21 @@ public class PartnerQuery {
     public void setCard_approving(boolean card_approving) {
         this.card_approving = card_approving;
     }
+
+    public boolean isCross_approving_flag() {
+        return cross_approving_flag;
+    }
+
+    public void setCross_approving_flag(boolean cross_approving_flag) {
+        this.cross_approving_flag = cross_approving_flag;
+    }
+
+    public boolean isCard_approving_flag() {
+        return card_approving_flag;
+    }
+
+    public void setCard_approving_flag(boolean card_approving_flag) {
+        this.card_approving_flag = card_approving_flag;
+    }
+
 }
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 c62c04184..702a8f149 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
@@ -287,8 +287,17 @@
     </select>
 
     <select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT DISTINCT c.*,o.name org_name,tmp.operator
+        SELECT DISTINCT c.*,o.name org_name,tmp.operator,
+        scup.upay_open_status,
+        scup.upay_approve_result,
+        scup.upay_approve_time,
+        scup.upay_refuse_remark,
+        scup.upay_approve_email_send,
+        scup.upay_approve_email_id,
+        cc.enable_cross_payment,
+        cc.enable_card_payment
         FROM sys_clients c
+        left join sys_client_upay_profile scup on scup.client_id = c.client_id
         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
@@ -316,21 +325,59 @@
             <if test="create_end_time!=null">
                 AND c.create_time &lt;= #{create_end_time}
             </if>
-
-            <if test="approving">
-                and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
-                c.open_status=1 or c.open_status=2 or c.open_status=4)
-            </if>
-            <if test="card_approving and approving">
-                OR c.client_id IN (
-                SELECT client_id FROM sys_client_upay_profile scup
-                WHERE ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
-                )
+            <if test="cross_approving_flag">
+                <if test="approving">
+                    and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
+                    c.open_status=1 or c.open_status=2 or c.open_status=4)
+                </if>
+                <if test="temp_mch_id!=null">
+                    and locate(c.sub_merchant_id,#{temp_mch_id})&gt;0 and cc.skip_clearing=0 and
+                    locate(c.client_moniker,#{temp_mch_id_source})&lt;=0
+                </if>
+                <if test="quickPass">
+                    and c.source=4
+                </if>
+                <if test="greenChannel">
+                    and ((c.source=1 or c.source=2) and c.approve_result=2 or c.open_status=10)
+                </if>
+                <if test="greenChannelBdTodo">
+                    and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3))
+                </if>
+                <if test="pass">
+                    and c.open_status = 5 AND c.approve_result = 1 AND c.approve_time IS NOT NULL
+                </if>
+                <if test="completed_contract">
+                    and c.open_status IS NULL AND c.approve_result IS NULL AND c.source != 4
+                </if>
+                <if test="apply_to_back">
+                    AND c.approve_result = 5 AND c.approve_time is NOT NULL
+                </if>
+                <if test="bd_upload_material">
+                    AND c.open_status = 3 AND c.approve_result != 5
+                </if>
             </if>
-            <if test="card_approving">
+            <if test="card_approving_flag">
                 AND c.client_id IN (
                 SELECT client_id FROM sys_client_upay_profile scup
-                WHERE ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
+                    WHERE 1=1
+                    <if test="approving">
+                        and ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
+                    </if>
+                    <if test="quickPass">
+                        and c.source=4
+                    </if>
+                    <if test="apply_to_back">
+                        AND scup.upay_approve_result = 5 AND scup.upay_approve_time is NOT NULL
+                    </if>
+                    <if test="completed_contract">
+                        AND scup.upay_open_status IS NULL AND scup.upay_approve_result IS NULL AND c.source != 4
+                    </if>
+                    <if test="pass">
+                        AND scup.upay_open_status = 5 AND scup.upay_approve_result = 1 AND scup.upay_approve_time IS NOT NULL
+                    </if>
+                    <if test="bd_upload_material">
+                        AND scup.upay_open_status = 3 AND scup.upay_approve_result != 5
+                    </if>
                 )
             </if>
             <if test="state!=null">
@@ -339,31 +386,7 @@
             <if test="merchant_id!=null">
                 and c.merchant_id=#{merchant_id}
             </if>
-            <if test="temp_mch_id!=null">
-                and locate(c.sub_merchant_id,#{temp_mch_id})&gt;0 and cc.skip_clearing=0 and
-                locate(c.client_moniker,#{temp_mch_id_source})&lt;=0
-            </if>
-            <if test="quickPass">
-                and c.source=4
-            </if>
-            <if test="greenChannel">
-                and ((c.source=1 or c.source=2) and c.approve_result=2 or c.open_status=10)
-            </if>
-            <if test="greenChannelBdTodo">
-                and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3))
-            </if>
-            <if test="pass">
-                and c.open_status = 5 AND c.approve_result = 1 AND c.approve_time IS NOT NULL
-            </if>
-            <if test="completed_contract">
-                and c.open_status IS NULL AND c.approve_result IS NULL AND c.source != 4
-            </if>
-            <if test="apply_to_back">
-                AND c.approve_result = 5 AND c.approve_time is NOT NULL
-            </if>
-            <if test="bd_upload_material">
-                AND c.open_status = 3 AND c.approve_result != 5
-            </if>
+
             <if test="search_text!=null">
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index af21458ea..2d996771b 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -806,9 +806,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.business_structures = businessStructuresMap.configs();
             $scope.clean_days = angular.copy(clean_days_map);
             $scope.bd_citys = angular.copy(bd_city_map);
-            $scope.params = {textType: 'all', org_name: 'ALL'};
+            $scope.params = {textType: 'all', org_name: 'ALL',approving_flag:false,card_approving_flag:false};
 
             $scope.loadPartners = function (page) {
+                $scope.validAndCleanApproveStatus();
                 var params = angular.copy($scope.params);
                 params.page = page || $scope.pagination.page || 1;
                 $http.get('/sys/partners/compliance', {params: params}).then(function (resp) {
@@ -817,6 +818,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
             };
 
+            $scope.validAndCleanApproveStatus = function(){
+                if(!$scope.params.cross_approving_flag && !$scope.params.card_approving_flag){
+                    $scope.params.approving = false
+                    $scope.params.card_approving = false
+                    $scope.params.waitingCompliance = false
+                    $scope.params.tempMchId = false
+                    $scope.params.bd_upload_material = false
+                    $scope.params.quickPass = false
+                    $scope.params.greenChannel = false
+                    $scope.params.pass = false
+                    $scope.params.completed_contract = false
+                    $scope.params.apply_to_back = false
+                    $scope.params.is_valid = false
+                }
+                if(!$scope.params.cross_approving_flag && $scope.params.card_approving_flag){
+                    $scope.params.tempMchId = false
+                    $scope.params.quickPass = false
+                    $scope.params.greenChannel = false
+                }
+            };
+
             $scope.today = new Date();
 
             $scope.listBDUsers = function () {
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html
index 6293716ee..4095696c5 100644
--- a/src/main/ui/static/payment/partner/templates/partner_compliance.html
+++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html
@@ -189,67 +189,71 @@
                                                 <span class="col-xs-8 col-sm-10">
                                                     <span class="checkbox-inline">
                                                         <label style="color: #f06010">
-                                                            <input type="checkbox" ng-model="params.approving"
+                                                            <input type="checkbox" ng-model="params.cross_approving_flag"
                                                                    id="approving-check">
                                                             <img height="20px" src="/static/images/royalpay_sign_s.png">
-                                                           Cross-Board Payment 等待合规
+                                                           Cross-Board Payment
                                                         </label>
                                                     </span>
                                                      <span class="checkbox-inline">
                                                         <label style="color: blue">
-                                                            <input type="checkbox" ng-model="params.card_approving"
+                                                            <input type="checkbox" ng-model="params.card_approving_flag"
                                                                    id="card_approving-check">
                                                            <img height="20px"
                                                                 src="/static/images/card_payment_sign.png">
 
-                                                            Card Payment等待合规
+                                                            Card Payment
                                                         </label>
                                                     </span>
-                                                    <span class="checkbox-inline">
+                                                </span>
+                                                <!--</div>-->
+                                            </div>
+                                            <div class="form-group col-sm-12" ng-if="'10'|withRole">
+                                                <label class="control-label col-xs-4 col-sm-2"></label>
+                                                <!--<div class="col-xs-8 col-sm-4">-->
+                                                <span class="col-xs-8 col-sm-10">
+                                                     <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag" >
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.approving"> 等待合规
+                                                        </label>
+                                                     </span>
+                                                     <span class="checkbox-inline" ng-if="params.cross_approving_flag" >
                                                         <label>
                                                             <input type="checkbox" ng-model="params.tempMchId"> 使用通用子商户号
                                                         </label>
                                                     </span>
-                                                     <span class="checkbox-inline">
+                                                     <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag">
                                                         <label>
                                                             <input type="checkbox" ng-model="params.bd_upload_material"> 等待BD上传材料审核
                                                         </label>
                                                     </span>
-
-                                                </span>
-                                                <!--</div>-->
-                                            </div>
-                                            <div class="form-group col-sm-12" ng-if="'10'|withRole">
-                                                <label class="control-label col-xs-4 col-sm-2"></label>
-                                                <!--<div class="col-xs-8 col-sm-4">-->
-                                                <span class="col-xs-8 col-sm-10">
-                                                    <span class="checkbox-inline warning">
+                                                    <span class="checkbox-inline warning" ng-if="params.cross_approving_flag">
                                                         <label style="color: yellowgreen" >
-                                                            <input type="checkbox" ng-model="params.quickPass"> 自助开通
+                                                            <input type="checkbox" ng-model="params.quickPass" > 自助开通
                                                         </label>
                                                     </span>
-                                                    <span class="checkbox-inline">
+                                                    <span class="checkbox-inline" ng-if="params.cross_approving_flag">
                                                         <label style="color: green">
                                                             <input type="checkbox" ng-model="params.greenChannel"> 绿色通道
                                                         </label>
                                                     </span>
 
-                                                    <span class="checkbox-inline">
+                                                    <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag">
                                                         <label>
                                                             <input type="checkbox" ng-model="params.pass"> 通过
                                                         </label>
                                                     </span>
-                                                    <span class="checkbox-inline">
+                                                    <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag">
                                                         <label>
                                                             <input type="checkbox" ng-model="params.completed_contract"> 资料完善中
                                                         </label>
                                                     </span>
-                                                    <span class="checkbox-inline">
+                                                    <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag">
                                                         <label style="color: yellow">
                                                             <input type="checkbox" ng-model="params.apply_to_back"> 申请打回
                                                         </label>
                                                     </span>
-                                                    <span class="checkbox-inline">
+                                                    <span class="checkbox-inline" ng-if="params.cross_approving_flag || params.card_approving_flag">
                                                         <label style="color: red">
                                                             <input type="checkbox" ng-model="params.is_valid"> 禁用
                                                         </label>
@@ -268,7 +272,7 @@
                                         </div>
                                     </div>
 
-                                </div>
+                                </div>z
 
                             </div>
 
@@ -323,23 +327,40 @@
                                     <td ng-bind="partner.short_name"></td>
                                     <td ng-bind="partner.sub_merchant_id"></td>
                                     <td ng-bind="partner.create_time"></td>
-                                    <td 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)}">
-                                        <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>
-                                        <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
-                                        <span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time">自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span>
-                                        <span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
-                                        <span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
-                                        <span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i
-                                                ng-if="partner.refuse_remark.length>0" class="fa fa-reply"
-                                                aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
-                                        <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
-                                        <span ng-if="partner.open_status==2">合同制作完成</span>
-                                        <span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
-                                        <span ng-if="partner.open_status==10">绿色通道申请中</span>
-                                        <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>
+                                    <td class="row">
+                                        <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>
+                                            <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
+                                            <span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time">自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span>
+                                            <span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
+                                            <span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
+                                            <span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                            <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
+                                            <span ng-if="partner.open_status==2">合同制作完成</span>
+                                            <span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
+                                            <span ng-if="partner.open_status==10">绿色通道申请中</span>
+                                            <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.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>
                                     <td ng-bind="partner.bd_user_name"></td>