费率延期 只开通了卡支付的商户费率自动延期

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()

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>

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>