From 22e8956d3415ac00270e2c07ae1aa43b1628a6f0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 28 Apr 2020 15:42:28 +0800
Subject: [PATCH] fix

---
 .../payment/manage/mappers/system/ClientMapper.xml   | 12 ++++++------
 .../manage/mappers/system/ClientRateMapper.xml       |  4 ++--
 src/main/ui/static/payment/partner/partner-manage.js | 10 +++++-----
 .../static/payment/partner/templates/partners.html   |  7 ++++---
 4 files changed, 17 insertions(+), 16 deletions(-)

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 3e964120b..dbdfc3ffb 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
@@ -141,20 +141,20 @@
 
             <if test="card_approving and approving">
                 OR (c.client_id NOT IN (
-                  SELECT client_id FROM sys_clients_card_flow
+                  SELECT client_id FROM sys_client_upay_profile
                 )
                 OR c.client_id IN (
-                  SELECT client_id FROM sys_clients_card_flow AS cardFlow
-                  WHERE cardFlow.approve_result = 4 or approve_result = 1
+                  SELECT client_id FROM sys_client_upay_profile AS cardFlow
+                  WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
                 ))
             </if>
             <if test="card_approving">
                 AND (c.client_id NOT IN (
-                  SELECT client_id FROM sys_clients_card_flow
+                  SELECT client_id FROM sys_client_upay_profile
                 )
                 OR c.client_id IN (
-                SELECT client_id FROM sys_clients_card_flow AS cardFlow
-                WHERE cardFlow.approve_result = 4 or approve_result = 1
+                SELECT client_id FROM sys_client_upay_profile AS cardFlow
+                WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
                 ))
             </if>
             <if test="quickPass">
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
index 3ab0d1fd2..469b5d65a 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
@@ -180,7 +180,7 @@
     <select id="latestCardChannelCleanDays" resultType="com.alibaba.fastjson.JSONObject">
         SELECT cr.*,c.clean_days c_clean_days FROM sys_client_rates cr
         INNER JOIN sys_clients c on c.client_id= cr.client_id and  c.is_valid = 1
-        INNER JOIN sys_clients_card_flow cf ON cf.client_id = c.client_id AND ( cf.approve_result 4 AND cf.open_status NOT IN (0,5) )
+        INNER JOIN sys_client_upay_profile cf ON cf.client_id = c.client_id AND ( cf.upay_approve_result = 4 AND cf.upay_open_status NOT IN (0,5) )
         where cr.client_id = #{client_id}
         and cr.rate_name = #{rate_name}
         order by cr.expiry_time desc
@@ -194,4 +194,4 @@
         order by expiry_time desc
         limit 1
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index f29f5c844..daa561021 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -690,13 +690,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             var promotiona_date='';
             var promotiona_period ='';
             var contentHtml = $sce.trustAsHtml(
-                '<lable>请输入优惠生成日:</lable> '+
-                '<input id="promotiona_date" ng-bind="promotiona_date"> (eg: 2020-02-01)' +
+                '<lable>请输入优惠开始日期(eg:2020-02-01):</lable> '+
+                '<input id="promotiona_date" ng-bind="promotiona_date">' +
                 '<div style="margin-bottom: 5px"></div>' +
-                '<lable>请输入活动周期数:</lable> ' +
-                '<input id="promotiona_period" ng-bind="promotiona_period"> (unit:week)');
+                '<lable>请输入活动周数(unit:week):</lable> ' +
+                '<input id="promotiona_period" ng-bind="promotiona_period">');
             var choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true},
-                {label: '确认提交', className: 'btn-success', key: '1'}];
+                {label: '确认生成', className: 'btn-success', key: '1'}];
             var content = '';
             $scope.showCardPromotionaBg = true;
             commonDialog.confirm({
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index 0b66ae73e..f2f38480f 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-5" 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 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>
@@ -502,10 +502,11 @@
                                             <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.upay_approve_result" class="col-xs-5">
+
+                                        <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" class="col-xs-5" 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)}">
+                                        <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>