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 ce1260d4b..2aa72574e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -125,7 +125,7 @@ public class WxRentContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") private String linkPhone; - @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "payAccount") + @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") private String payAccount; @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java index 178c9f059..3ba4a1044 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java @@ -10,7 +10,8 @@ public enum EnumRentContractStatus { RENT_PAID(3, "计租中"), CONTRACT_END_SOON(4, "即将到期"), CONTRACT_END(5, "正常到期"), - CONTRACT_TERMINATE(6, "提前终止") + CONTRACT_TERMINATE(6, "提前终止"), + INVALID(7, "作废") ; public static EnumRentContractStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 06cd5fbfc..36581c8ce 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -31,4 +31,6 @@ public interface WxRentContractMapper extends CommonMapper shopLeftInfo=wxShopMapper.queryShopLeftInfo(shopparams); resultData.put("shopLeftInfo",shopLeftInfo); + //需要更新的状态 resultData.putAll(updateStatus(tenantId)); return resultData; @@ -299,6 +300,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setTenantId(tenantId); + //作废合同 + wxRentContract.setStatus(EnumRentContractStatus.INVALID.getCode()); + wxRentContractMapper.updateRentInvalidStatus(wxRentContract); + //待签约 wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxRentContractMapper.updateRentWaitSignStatus(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 9487d7d8f..413dcadc8 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -84,7 +84,7 @@ - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and DATEDIFF(rental_end_date,now()) <= 30 + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and rental_start_date <= now() and rental_end_date >= now() + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_start_date <= now() and rental_end_date >= now() - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and rental_end_date <now() + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_end_date <now() - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and merchant_id is null + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=7 and merchant_id is null + + + + update wx_rent_contract set status=#{status} where shop_id in ( + select s.shop_id from (SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and merchant_id is not null and status!=6 + )s) and merchant_id is null and tenant_id=#{tenantId}