From 253c046b087fa9d038762995d98dd05c86b69ab5 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Wed, 29 Dec 2021 16:23:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E7=A0=81=20=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=89=AB=20=E4=B8=8D=E6=98=BE=E7=A4=BAalipay+?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/templates/billCode/js/mobile_payment.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/ui/static/templates/billCode/js/mobile_payment.js b/src/main/ui/static/templates/billCode/js/mobile_payment.js
index 75e5a066d..ca4e81309 100644
--- a/src/main/ui/static/templates/billCode/js/mobile_payment.js
+++ b/src/main/ui/static/templates/billCode/js/mobile_payment.js
@@ -164,8 +164,6 @@ $(document).ready(function () {
             if(paymentFun == 'AlipayAps'){
                 if(window.openmobilefun == 'alipayaps'){
                     paymentLink = '/api/v1.0/share_code/business/bills/'+window.billInfo.bill_code_id+'/alipay_aps/mobile';
-                }else{
-                    paymentLink = '/api/v1.0/share_code/business/bills/'+window.billInfo.bill_code_id+'/alipay_aps/mobile/redirectApp?priorityChannel=AlipayAps';
                 }
             }
             if(paymentFun == 'Bank'){
@@ -191,9 +189,6 @@ $(document).ready(function () {
             if(paymentFun == 'AlipayAps'){
                 if(window.openmobilefun == 'alipayaps'){
                     paymentLink = '/api/v1.0/share_code/bills/payment/orders/'+window.billInfo.bill_code_id+'/alipay_aps/share_link'
-                }else{
-                    paymentLink = '/api/v1.0/share_code/bills/payment/'+window.billInfo.bill_code_id+'/alipay_aps/mobile/redirectApp?priorityChannel=AlipayAps';
-
                 }
             }
             if(paymentFun == 'Bank'){

From 936fddc8cf47fe7a1dd85e6e4ef777cd024062a4 Mon Sep 17 00:00:00 2001
From: Todking <tod.wu@geekforbest.com>
Date: Thu, 30 Dec 2021 15:40:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E8=B4=B9=E7=8E=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=B8=85?=
 =?UTF-8?q?=E7=AE=97=E5=91=A8=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/partner_bankaccounts.html        | 10 ++--------
 .../payment/partner/templates/rate_config_dialog.html  |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

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 ffbfae97a..de1d6507a 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -281,10 +281,7 @@
                             <th>Transaction Fee</th>
                             <th>Active Time</th>
                             <th>Expire Time</th>
-                            <th
-                                    ng-if="bankCtrl.rate_name=='Wechat'">
-                                Clean Days
-                            </th>
+                            <th>Clean Days</th>
                             <th>Update Time</th>
                             <th>Operator</th>
                             <th>Remark</th>
@@ -299,10 +296,7 @@
                             <td ng-bind="'$ '+rate.transaction_fee"></td>
                             <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
-                            <td
-                                    ng-if="rate.rate_name=='Wechat'">
-                                T+{{rate.clean_days}}
-                            </td>
+                            <td>T+{{rate.clean_days}}</td>
                             <td ng-bind="rate.update_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.operator_name||'系统生成'"></td>
                             <td ng-bind="rate.remark|limitTo:20" title="{{rate.remark}}"></td>
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index 586607cba..64402eecd 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -104,9 +104,7 @@
                                datepicker-options="{minDate:rate.active_time}">
                     </div>
                 </div>
-                <div class="form-group" ng-if="rate.rate_name=='Wechat'
-                || rate.rate_name=='rpaypmt_card'
-                || rate.rate_name=='rpaypmt_dd'">
+                <div class="form-group">
                     <label class="control-label col-sm-4" for="clean_days_input">Clean Days</label>
                     <div class="col-sm-6">
                         <div class="input-group">