费率延期 卡支付没有同步部分数据

master
dalong306 3 years ago
parent a36a299c57
commit 22e2d038b9

@ -152,10 +152,10 @@
<update id="postponeMerchantRateByClientId"> <update id="postponeMerchantRateByClientId">
<![CDATA[ <![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), 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(), 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 FROM (select rr.* from sys_client_rates rr
WHERE rr.client_id = #{client_id} WHERE rr.client_id = #{client_id}
and rr.rate_name = #{channel} and rr.rate_name = #{channel}

@ -6815,6 +6815,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) { function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) {
$scope.wxIndustries = angular.copy(wxMerchantIndustries) $scope.wxIndustries = angular.copy(wxMerchantIndustries)
$scope.subMerchantInfo = angular.copy(subMerchantInfo) $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.subMerchantInfo.company_register_no = subMerchantInfo.abn ? subMerchantInfo.abn : subMerchantInfo.acn
$scope.wechatMccIndustries = wechatGoodMcc.configs() $scope.wechatMccIndustries = wechatGoodMcc.configs()
$scope.merchantIds = merchantIds.data $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.short_name = $scope.merchantInfo.short_name
$scope.subMerchantInfo.industry = $scope.merchantInfo.industry $scope.subMerchantInfo.industry = $scope.merchantInfo.industry
$scope.subMerchantInfo.company_website = $scope.merchantInfo.company_website $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.company_phone = $scope.merchantInfo.company_phone
$scope.subMerchantInfo.contact_person = $scope.merchantInfo.contact_person $scope.subMerchantInfo.contact_person = $scope.merchantInfo.contact_person
$scope.subMerchantInfo.contact_phone = $scope.merchantInfo.contact_phone $scope.subMerchantInfo.contact_phone = $scope.merchantInfo.contact_phone

Loading…
Cancel
Save