From ddf5a4e550af517aebbda42c217d0309642fa6c6 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 22 Dec 2024 21:07:29 +0800 Subject: [PATCH] fix --- .../java/com/iformall/mapper/WxAllBillMapper.java | 2 ++ .../service/impl/WxPropertyContractServiceImpl.java | 7 +++++++ .../service/impl/WxRentContractServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/WxAllBillMapper.xml | 11 ++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java index 59f6f3e40..0aab375b7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java @@ -55,5 +55,7 @@ public interface WxAllBillMapper extends CommonMapper { void deleteEnergyReadingBills(@Param("energyReadingCalcuteId")Long energyReadingCalcuteId,@Param("tenantId")String tenantId); void updateContractCusName(WxAllBill wxBillRent); + + void updateAllContractCusName(WxAllBill wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index f7dbe5507..d78c32e22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1503,6 +1503,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setUpdateBy(user.getId()); record.setUpdateByName(user.getName()); wxPropertyContractMapper.updateById(record); + + //更新账单归属 + WxAllBill bill = new WxAllBill(); + bill.updateTenantInfo(record); + bill.setPropertyContractId(record.getId()); + bill.setCusName(record.getCustomerName()); + wxAllBillMapper.updateAllContractCusName(bill); } @Override 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 0d6038722..d162fb153 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2103,6 +2103,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { rentContract.setUpdateByName(user.getName()); wxRentContractMapper.updateById(rentContract); + //更新账单归属 + WxAllBill bill = new WxAllBill(); + bill.updateTenantInfo(rentContract); + bill.setRentContractId(rentContract.getId()); + bill.setCusName(rentContract.getCustomerName()); + wxAllBillMapper.updateAllContractCusName(bill); + if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { WxPropertyContract pq = new WxPropertyContract(); pq.updateTenantInfo(rentContract); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index b01e8565a..b66489480 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -453,7 +453,16 @@ and property_contract_id = #{propertyContractId} - + + + update wx_all_bill set cus_name = #{cusName} where tenant_id = #{tenantId} + + and rent_contract_id = #{rentContractId} + + + and property_contract_id = #{propertyContractId} + +