From e02ae9cca7ecefd0eccae21abf6e52f59cf2fc16 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 5 Jul 2021 17:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=8E=87=E5=BB=B6=E6=9C=9F=20=20?=
 =?UTF-8?q?=E5=8F=AA=E5=BC=80=E9=80=9A=E4=BA=86=E5=8D=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=9A=84=E5=95=86=E6=88=B7=E8=B4=B9=E7=8E=87=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/system/ClientRateMapper.xml  | 17 ++++++++++++++++-
 .../templates/new_apply_wx_sub_merchant_id.html |  1 +
 .../update_apply_wx_sub_merchant_id.html        |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

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 56592ce15..d98dd4c82 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
@@ -128,7 +128,22 @@
                 c.approve_result = 1
                 OR (
                     c.approve_result = 2
-                AND ( c.source = 1 OR c.source = 2 )))
+                AND ( c.source = 1 OR c.source = 2 ))
+
+                 OR(
+                 	enable_rpaypmt_card = 1
+                    AND (
+                        (
+                            c.source != 4
+                            AND ( SELECT upay_open_status FROM sys_client_upay_profile WHERE client_id = c.client_id )= 5
+                        )
+                        OR (
+                            c.source = 4
+                            AND ( SELECT upay_open_status FROM sys_client_upay_profile WHERE client_id = c.client_id )= 1
+                        )
+                    )
+                 )
+                )
             and  c.is_valid = 1
             group by c.client_id,client_moniker,rate_name
             HAVING max_expire<=curdate()
diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
index 97850b1db..8db9d696a 100644
--- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
@@ -98,6 +98,7 @@
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="url">The beginning of http</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 100</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
index 821e07160..13a41048d 100644
--- a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
@@ -94,7 +94,7 @@
                                 <label class="control-label col-sm-3" for="website_input">* Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="url" name="website" id="website_input" required maxlength="100">
+                                           type="url" name="company_website" id="website_input" required maxlength="100">
                                     <p class="small " >(Not required when  business type is Offline scenario)</p>
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>