From 48f251050830a83aecfbfeb875e85215994573e7 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 25 May 2020 16:30:25 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  2 +-
 .../ui/static/payment/partner/partner-manage.js  | 16 ++++++++++++++++
 .../partner/templates/partner_bankaccounts.html  |  5 +++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c3cfc1b87..c64f264dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.10</version>
+    <version>2.3.11</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/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index af21458ea..da60602d1 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -1103,6 +1103,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
             //制作卡支付合同
             $scope.exportCardAgreegatePDF = function () {
+                if (!$rootScope.complianceCheck) {
+                    alert("please check first");
+                    return;
+                }
+                if (!$rootScope.complianceCheck.authFile) {
+                    alert("Compliance Files not checked");
+                    return;
+                }
+                if (!$rootScope.complianceCheck.clientInfo) {
+                    alert("Partner Detail not checked");
+                    return;
+                }
+                if (!$rootScope.complianceCheck.bankAccount) {
+                    alert("Bank Account not checked");
+                    return;
+                }
                 $scope.showBg = true;
                 $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/card_agree_pdf').then(function () {
                     commonDialog.alert({
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 3ecd4beed..97d145124 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -297,9 +297,10 @@
                     <td style="text-align: center">
                         <a role="button" ng-click="editRate(rate)" style="padding-right: 10px;"
                            ng-if="'011'|withRole"><i class="fa fa-edit"></i></a>
-                        <span ng-if="rate.active=='1' && rate.current=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')">
+                        <span ng-if="rate.active=='1' && rate.current=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')
+                        && partner.upay_approve_result!=1 && partner.upay_approve_result">
                             <span style="color: orange">(Promotional Offer)</span>
-                            <a ng-if="partner.upay_approve_result!=1" class="fa fa-cloud-download" target="_blank"
+                            <a class="fa fa-cloud-download" target="_blank"
                                ng-href="/sys/partners/{{partner.client_moniker}}/export/aggregate/card_promotion_agree_pdf?rateid={{rate.client_rate_id}}"></a>
                         </span>
                     </td>