From 314b2085b3f0bf951005e9684f714b3e06a490a5 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 23 Dec 2024 20:54:44 +0800 Subject: [PATCH] fix --- .../contract/WxPropertyContractController.java | 6 ++++++ .../contract/WxRentContractController.java | 7 +++++++ .../com/iformall/mapper/WxAllBillMapper.java | 2 +- .../impl/WxPropertyContractServiceImpl.java | 2 +- .../impl/WxRentContractServiceImpl.java | 2 +- .../main/resources/mapper/WxAllBillMapper.xml | 18 +++++++++++++++++- 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index a25bd6cd9..a0258a22f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -536,6 +536,12 @@ public class WxPropertyContractController extends WxContractBaseController { } try { + contract.setCustomersId(proertyContract.getCustomersId()); + contract.setCustomerType(proertyContract.getCustomerType()); + contract.setCustomerName(proertyContract.getCustomerName()); + contract.setCustomerLinkPerson(proertyContract.getCustomerLinkPerson()); + contract.setCustomerPhone(proertyContract.getCustomerPhone()); + contract.setCustomerLegalPerson(proertyContract.getCustomerLegalPerson()); wxPropertyContractService.transfer(contract,user); }catch(Exception e) { logger.error("transfer error.",e); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 0e1417803..bb598b9e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -615,6 +615,13 @@ public class WxRentContractController extends WxContractBaseController { MallUserInfo user = getUser(); try { + rentContract.setCustomersId(wxRentContract.getCustomersId()); + rentContract.setCustomerType(wxRentContract.getCustomerType()); + rentContract.setCustomerName(wxRentContract.getCustomerName()); + rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson()); + rentContract.setCustomerPhone(wxRentContract.getCustomerPhone()); + rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson()); + wxRentContractService.transfer(rentContract,user); }catch(Exception e) { logger.error("transfer error.",e); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java index 0aab375b7..3386fe72a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java @@ -56,6 +56,6 @@ public interface WxAllBillMapper extends CommonMapper { void updateContractCusName(WxAllBill wxBillRent); - void updateAllContractCusName(WxAllBill wxBillRent); + void transferCusName(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 d78c32e22..16cd44fa3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1509,7 +1509,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.updateTenantInfo(record); bill.setPropertyContractId(record.getId()); bill.setCusName(record.getCustomerName()); - wxAllBillMapper.updateAllContractCusName(bill); + wxAllBillMapper.transferCusName(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 4772c7af2..64a5967ed 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2099,7 +2099,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.updateTenantInfo(rentContract); bill.setRentContractId(rentContract.getId()); bill.setCusName(rentContract.getCustomerName()); - wxAllBillMapper.updateAllContractCusName(bill); + wxAllBillMapper.transferCusName(bill); if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { WxPropertyContract pq = new WxPropertyContract(); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index b66489480..a4f0b4ce8 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -455,7 +455,7 @@ - + update wx_all_bill set cus_name = #{cusName} where tenant_id = #{tenantId} and rent_contract_id = #{rentContractId} @@ -463,6 +463,22 @@ and property_contract_id = #{propertyContractId} + and( + + ( + ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and bill_type not in (13,21,5,6,7)) + or + ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and bill_type in (13,21,5,6,7)) + ) + + or ( + ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5,6,7)) + or + ( `pay` - IFNULL(`return_pay`,'0') - IFNULL(`use_money`,'0') > 0 and bill_type in (13,21,5,7)) + ) + ) + +