From 25f459b78df40a1cf9d1c022d9def99649cfee9d Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 15 Jun 2025 20:09:34 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/mapper/WxRentContractMapper.java | 1 + .../com/iformall/service/impl/WxRentContractServiceImpl.java | 1 + .../src/main/resources/mapper/WxRentContractMapper.xml | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index ed013dd51..94cccd1ef 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -41,6 +41,7 @@ public interface WxRentContractMapper extends CommonMapper List findToEndContractList(WxRentContract rentContract); + void deleteValidDelete(@Param("tenantId") String tenantId,@Param("id") Long id); void copyValidDeleteContract(WxRentContract rentContract); void deleteContract(@Param("tenantId") String tenantId,@Param("id") Long id); void updateContractId(@Param("tenantId") String tenantId,@Param("oldId") Long oldId,@Param("newId") Long newId); 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 9adf32816..c8e04ad94 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -520,6 +520,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Long orginId = record.getOrginId(); if (record.isYingZiContract()){ isYingzi = true; + wxRentContractMapper.deleteValidDelete(record.getTenantId(),orginId); WxRentContract mr = wxAgileContractService.findMainContract(id, record); wxRentContractMapper.copyValidDeleteContract(mr); wxRentContractMapper.deleteContract(record.getTenantId(),orginId); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e7d9709eb..625b75a2a 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -243,6 +243,11 @@ where `tenant_id` = #{tenantId} and status = 3 and end_contract_time <= now(); + + + delete from wx_rent_contract_valid_delete where `tenant_id` = #{tenantId} and id = #{id} + + insert into wx_rent_contract_valid_delete() values( #{id},#{customersId},#{tenantId},#{parentTenantId},#{decimalSize},#{rentalStartDate},