From 22e2d038b9927964e5c9fb3184d81fb9e712e219 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 30 Aug 2021 18:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=8E=87=E5=BB=B6=E6=9C=9F=20=20?=
 =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/mappers/system/ClientRateMapper.xml       | 4 ++--
 src/main/ui/static/payment/partner/partner-manage.js         | 5 ++++-
 2 files changed, 6 insertions(+), 3 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 d98dd4c82..4c713885d 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
@@ -152,10 +152,10 @@
     <update id="postponeMerchantRateByClientId">
         <![CDATA[
 
-                INSERT sys_client_rates (manager_id, client_id, rate_name, rate_value, transaction_fee, active_time, expiry_time, create_time, update_time, manager_name, clean_days, remark)
+                INSERT sys_client_rates (manager_id, client_id, rate_name, rate_value, transaction_fee, active_time, expiry_time, create_time, update_time, manager_name, clean_days, remark,ext_rates,pay_type)
                 SELECT CONCAT('System-', CURRENT_DATE()),r.client_id,r.rate_name,r.rate_value,r.transaction_fee,DATE_ADD(r.expiry_time, INTERVAL 1 day),
                 IF(DATE_ADD( r.expiry_time, INTERVAL 1 YEAR )<=NOW(),DATE_ADD( r.expiry_time, INTERVAL 2 YEAR ),DATE_ADD( r.expiry_time, INTERVAL 1 YEAR )) expiry_time,NOW(), NOW(),
-                       CONCAT('System-', CURRENT_DATE()),r.clean_days,'费率自动延期一年'
+                       CONCAT('System-', CURRENT_DATE()),r.clean_days,'费率自动延期一年',r.ext_rates,r.pay_type
                 FROM (select rr.* from sys_client_rates rr
                     WHERE rr.client_id = #{client_id}
                     and rr.rate_name = #{channel}
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index aaac1fd4b..4e63e0fb4 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -6815,6 +6815,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) {
       $scope.wxIndustries = angular.copy(wxMerchantIndustries)
       $scope.subMerchantInfo = angular.copy(subMerchantInfo)
+        $scope.subMerchantInfo.address=  subMerchantInfo.address+","+subMerchantInfo.suburb
+        +","+subMerchantInfo.state+","+subMerchantInfo.country;
       $scope.subMerchantInfo.company_register_no = subMerchantInfo.abn ? subMerchantInfo.abn : subMerchantInfo.acn
       $scope.wechatMccIndustries = wechatGoodMcc.configs()
       $scope.merchantIds = merchantIds.data
@@ -6993,7 +6995,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.subMerchantInfo.short_name = $scope.merchantInfo.short_name
         $scope.subMerchantInfo.industry = $scope.merchantInfo.industry
         $scope.subMerchantInfo.company_website = $scope.merchantInfo.company_website
-        $scope.subMerchantInfo.address = $scope.merchantInfo.address
+        $scope.subMerchantInfo.address = $scope.merchantInfo.address+","+$scope.merchantInfo.suburb
+            +","+$scope.merchantInfo.state+","+$scope.merchantInfo.country;
         $scope.subMerchantInfo.company_phone = $scope.merchantInfo.company_phone
         $scope.subMerchantInfo.contact_person = $scope.merchantInfo.contact_person
         $scope.subMerchantInfo.contact_phone = $scope.merchantInfo.contact_phone