From 018f392e5e244fd5226c1179b3c735ed00b8f1af Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 3 Aug 2024 13:21:29 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/impl/WxAllBillServiceImpl.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 1 + mallinkService/src/main/resources/mapper/WxAllBillMapper.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index cd5c61ebc..41e56c067 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -443,7 +443,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill WxAllBill br = new WxAllBill(); br.setRentContractId(rentContract.getId()); br.updateTenantInfo(rentContract); - br.setIsPreview(EnumYesOrNo.NO.getCode()); + //br.setIsPreview(EnumYesOrNo.NO.getCode()); List brList = wxAllBillMapper.findList(br); List realRentList = new ArrayList(); List actionList = new ArrayList(); 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 87e5754fc..cf5e18791 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -905,6 +905,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillDeposit.setId(idWorker.nextId()); wxBillDeposit.setRentContractId(wxRentContract.getId()); wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); + wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode()); if (null != fees) { wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName()); } diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index dfb7395f4..d9a7d2362 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -217,7 +217,7 @@ - delete from wx_all_bill where rent_contract_id = #{rentContractId} and is_preview = 0 and status = 2 + delete from wx_all_bill where rent_contract_id = #{rentContractId} and status = 2 and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 and IFNULL(`return_pay`,'0') <= 0 and rent_contract_id = #{rentContractId}