From 4ee29658bc5f14051b317b42a7249f5906e6146e Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 10 Oct 2019 14:51:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9][=E5=BC=80=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 4 ++-- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 31e72dae9..acdf21e82 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -358,8 +358,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } - if(record.getServiceChargePay() != null) { - record.setServiceChargePay(record.getServiceChargePay() * 100); + if(record.getServiceChargePayUpdate() != null) { + record.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 08bd61343..e72e87900 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -471,8 +471,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } - if(record.getServiceChargePay() != null) { - record.setServiceChargePay(record.getServiceChargePay() * 100); + if(record.getServiceChargePayUpdate() != null) { + record.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); From e19364f7fb793d48b7e6ccbd68078405bcb5bd0f Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 10 Oct 2019 15:12:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9][=E5=BC=80=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index dd4aca7f1..9d7ea1f65 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -210,7 +210,7 @@ select rc.*,s.shop_number from wx_rent_contract rc inner join wx_shop s on rc.shop_id=s.id - where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId} + where rc.status not in(0,1,5,6,7,8) and rc.tenant_id=#{tenantId} and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(5,6,7) and tenant_id=#{tenantId} ) pc) From e789e7e67352f6947cd063baa01dffc9c42792ba Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 10 Oct 2019 15:40:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9][=E5=BC=80=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 52403d7d3..2aa39fbdd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -487,6 +487,7 @@ and o.tenant_id=#{tenantId} and cm.`merchant_id` = #{id} + and mb.merchant_id = #{id}