From 864e5b9d6920305a66b4bda8b6decb4be592e3bd Mon Sep 17 00:00:00 2001 From: xiaohu Date: Sun, 23 Aug 2020 17:17:08 +0800 Subject: [PATCH 1/2] 1 --- .../src/main/resources/mapper/WxAppinfoMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 5568fb4eb..02cc8b2d6 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -17,6 +17,7 @@ + @@ -24,7 +25,7 @@ `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, - `pay_id`,`type`,`pay_bill_id` + `pay_id`,`type`,`pay_bill_id`,`plat` @@ -86,6 +87,9 @@ and `pay_bill_id` = #{payBillId} + + and `plat` = #{plat} + and id in From 3c90584034754ecef12637d3c269d1ba13cbc491 Mon Sep 17 00:00:00 2001 From: xiaohu Date: Sun, 23 Aug 2020 18:32:06 +0800 Subject: [PATCH 2/2] 1 --- .../com/iformall/service/impl/WxProjectConfigServiceImpl.java | 1 + .../src/main/resources/mapper/WxPayAccountBillMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 31c6eddbc..85bccd95f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -192,6 +192,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { if(wxPayAccountBill == null){ wxPayAccountBill = new WxPayAccountBill(); wxPayAccountBill.setTenantId(wxPayAccount.getTenantId()); + wxPayAccountBill.setServiceChargeRate(0); } wxPayAccountBill.setMchId(wxPayAccount.getMchId()); wxPayAccountBill.setSubMchId(wxPayAccount.getSubMchId()); diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml index 76e3f339e..6585b2e33 100644 --- a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml @@ -20,7 +20,8 @@ - `id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate` + `id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`, + `type`,`share`,`rate`,`real_rate`,`service_charge_rate`