From 6c4326bed0e394f54c63a88df45ba61816fd9fe4 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 3 Aug 2024 12:19:25 +0800 Subject: [PATCH] fix --- .../service/impl/WxRentContractServiceImpl.java | 11 ++++++----- .../src/main/resources/mapper/WxAllBillMapper.xml | 2 +- 2 files changed, 7 insertions(+), 6 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 e9b558acd..87e5754fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -276,6 +276,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setRentContractId(id); wxBillRent.setSortColumns("starttime asc"); wxBillRent.updateTenantInfo(wxRentContract); + wxBillRent.setBillType(EnumBillAllType.RENT.getCode()); List resultList = wxAllBillMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); @@ -2042,11 +2043,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { // wxMerchant.updateTenantInfo(record); //商业管理费,营业管理费 - WxAllBill billRentManage = new WxAllBill(); - billRentManage.setRentContractId(id); - billRentManage.setIsPreview(EnumIsPreview.NO.getCode()); - billRentManage.updateTenantInfo(record); - wxAllBillMapper.updatePreviewStatus(billRentManage); + //WxAllBill billRentManage = new WxAllBill(); + //billRentManage.setRentContractId(id); + //billRentManage.setIsPreview(EnumIsPreview.NO.getCode()); + //billRentManage.updateTenantInfo(record); + //wxAllBillMapper.updatePreviewStatus(billRentManage); if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) { //押金 diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index b8d45fc8c..dfb7395f4 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -232,7 +232,7 @@ - update wx_all_bill set is_preview = #{isPreview},merchant_id = #{merchantId},need_pay = receive_pay + update wx_all_bill set is_preview = #{isPreview} where rent_contract_id = #{rentContractId}