From 30fb5d70d8bdeaa71846c7e8c03de93312916169 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 15 Jun 2025 19:48:12 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRentContract.java | 119 +++++++++--------- .../iformall/mapper/WxRentContractMapper.java | 2 +- .../service/WxAgileContractService.java | 1 + .../impl/WxAgileContractServiceImpl.java | 10 ++ .../impl/WxRentContractServiceImpl.java | 3 +- .../resources/mapper/WxRentContractMapper.xml | 11 +- 6 files changed, 81 insertions(+), 65 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index fc3b7c00e..faedce664 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -41,27 +41,8 @@ import java.util.Map; public class WxRentContract extends TenantEntity { protected Long id; - + @io.swagger.annotations.ApiModelProperty(value = "客户编号", name = "customersId") private Long customersId; - @TableField(exist = false) - private Integer customerType; - @TableField(exist = false) - private String customerTypeName; - public String getCustomerTypeName() { - if (null != customerType) { - return EnumShopUsersPrincipalType.getEnum(customerType).getMessage(); - } - return null; - } - @TableField(exist = false) - private String customerName; - @TableField(exist = false) - private String customerLinkPerson; - @TableField(exist = false) - private String customerPhone; - @TableField(exist = false) - private String customerLegalPerson; - @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; @io.swagger.annotations.ApiModelProperty(value = "合同签约时间", name = "signDate") @@ -74,27 +55,42 @@ public class WxRentContract extends TenantEntity { private String designFile; @io.swagger.annotations.ApiModelProperty(value = "租期总月数(月)", name = "lease") private Integer lease; - @io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId") - private Long fromId; - //联系地址 - private String linkAddress; - @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") - private String linkPerson; - @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") - private String linkPhone; + @io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute") + private Integer dayPriceCalcute; + @io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays") + private Integer monthAverageDays; @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") private Integer decimalSize = Constant.default_short_decimal_size ; + @io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type") + private Integer type; @TableField(exist = false) - private String priceTwoDecimal;//2位小数 - + private String typeName; + public String getTypeName() { + if (null != type) { + return EnumAgileContractType.getEnum(type).getMessage(); + } + return null; + } + @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") + private String rentArea; + @io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr") + private String shopIdStr; + @io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus") + private Integer applyStatus; + @io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") + private Date endContractTime; @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") private String filepath; @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") private String fileNames; + @io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit") + private String cashtypeContentLsit; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") + private String rentInfo; @io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status") private Integer status; - @TableField(exist = false) - private List statuss; @TableField(exist = false) private String statusName; public String getStatusName() { @@ -103,11 +99,14 @@ public class WxRentContract extends TenantEntity { } return null; } - - @io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit") - private String cashtypeContentLsit; - @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") - private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId") + private Long fromId; + //联系地址 + private String linkAddress; + @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") + private String linkPerson; + @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") + private String linkPhone; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") private Date updatetime; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") @@ -120,32 +119,8 @@ public class WxRentContract extends TenantEntity { private Long createBy; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy") private String createByName; - @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") - private String rentArea; - @io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr") - private String shopIdStr; - @io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type") - private Integer type; - @TableField(exist = false) - private String typeName; - public String getTypeName() { - if (null != type) { - return EnumAgileContractType.getEnum(type).getMessage(); - } - return null; - } - @io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus") - private Integer applyStatus; - @io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") - private Date endContractTime; @io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") private String remark; - @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") - private String rentInfo; - @io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute") - private Integer dayPriceCalcute; - @io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays") - private Integer monthAverageDays; @io.swagger.annotations.ApiModelProperty(value = "来源ID,用于履约中合同修改影子数据", name = "orginId") private Long orginId; @@ -254,6 +229,28 @@ public class WxRentContract extends TenantEntity { @TableField(exist = false) private WxRentContract child; + @TableField(exist = false) + private String priceTwoDecimal;//2位小数 + @TableField(exist = false) + private Integer customerType; + @TableField(exist = false) + private String customerTypeName; + public String getCustomerTypeName() { + if (null != customerType) { + return EnumShopUsersPrincipalType.getEnum(customerType).getMessage(); + } + return null; + } + @TableField(exist = false) + private String customerName; + @TableField(exist = false) + private String customerLinkPerson; + @TableField(exist = false) + private String customerPhone; + @TableField(exist = false) + private String customerLegalPerson; + @TableField(exist = false) + private List statuss; //是否有工作流 1:有 0:无" @TableField(exist = false) private Integer flowHas; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index fc4a9183d..ed013dd51 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -41,7 +41,7 @@ public interface WxRentContractMapper extends CommonMapper List findToEndContractList(WxRentContract rentContract); - void copyValidDeleteContract(@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/WxAgileContractService.java b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java index f11a6edab..c87913830 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java @@ -33,6 +33,7 @@ public interface WxAgileContractService { ResultData saveOrUpdate(WxRentContract record,MallUserInfo user); WxRentContract findYingZiContract(Long orginId,TenantEntity tenantEntity); + WxRentContract findMainContract(Long id,TenantEntity tenantEntity); void saveDeposit(WxRentContract wxRentContract,MallUserInfo user); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index d6b7d17e3..ea1289528 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -303,6 +303,16 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } + @Override + public WxRentContract findMainContract(Long id,TenantEntity tenantEntity) { + WxRentContract rentContract = wxRentContractMapper.selectById(id); + if (null != rentContract && rentContract.isYingZiContract()) { + return wxRentContractMapper.selectById(rentContract.getOrginId()); + } + return null; + + } + @Override public void setCustomers(WxRentContract record,EnumContractCustomersStatus status) { WxContractCustomers cq = new WxContractCustomers(); 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 d25978df7..9adf32816 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -520,7 +520,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { Long orginId = record.getOrginId(); if (record.isYingZiContract()){ isYingzi = true; - wxRentContractMapper.copyValidDeleteContract(record.getTenantId(), orginId); + WxRentContract mr = wxAgileContractService.findMainContract(id, record); + wxRentContractMapper.copyValidDeleteContract(mr); wxRentContractMapper.deleteContract(record.getTenantId(),orginId); wxRentContractMapper.updateContractId(record.getTenantId(), id, orginId); record.setId(orginId); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index b7b14da63..1c26cde7d 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -243,8 +243,15 @@ where `tenant_id` = #{tenantId} and status = 3 and end_contract_time <= now(); - - insert into wx_rent_contract_valid_delete() select from wx_rent_contract where id = #{id} and `tenant_id` = #{tenantId} + + insert into wx_rent_contract_valid_delete() values( + #{item.id},#{item.customersId},#{item.tenantId},#{item.parentTenantId},#{item.decimalSize},#{item.rentalStartDate}, + #{item.rentalEndDate},#{item.signDate},#{item.filepath},#{item.status},#{item.contractNumber},#{item.createBy}, + #{item.updateBy},#{item.dayPriceCalcute},#{item.monthAverageDays},#{item.cashtypeContentLsit},#{item.isDel}, + #{item.updatetime},#{item.createtime},#{item.linkPerson},#{item.linkPhone},#{item.linkAddress},#{item.lease}, + #{item.type},#{item.fromId},#{item.endContractTime},#{item.applyStatus},#{item.createByName},#{item.updateByName}, + #{item.rentInfo},#{item.fileNames},#{item.shopIdStr},#{item.designFile},#{item.remark},#{item.orginId} + )