From 8bf193455791703b0f7d8b609f28144ed152bc7d Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 29 Apr 2019 00:31:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0b86f0dce..bcb7bb184 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -344,11 +344,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { return resultData; } - if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null - && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { - //删除预账单,重新生成 - wxBillRentMapper.deletePreviewBill(record); - resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); + if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { + if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { + //删除预账单,重新生成 + wxBillRentMapper.deletePreviewBill(record); + resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); + } } /* //有改变,删除预账单,重新生成 if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null From ff8229e5cdc992acc7294a24ef76d495eae0ea19 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 29 Apr 2019 00:42:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=87=AA=E7=84=B6=E5=A2=9E=E9=95=BF=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 6a68f5932..9647c3850 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -415,7 +415,6 @@ SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is null and cubi.tenant_id =#{tenantId} - and cu.tenant_id =#{tenantId} @@ -423,7 +422,6 @@ SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is not null and cubi.tenant_id =#{tenantId} - and cu.tenant_id =#{tenantId}