diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 987394893..a404c3307 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -21,6 +21,8 @@ public class WxPropertyContract implements Serializable { // 审核状态,0未审核 1审核中 2审核完成 3驳回 4合同作废 private Integer applyStatus; + // 审批流1合同2账单3终止审批 + private Integer businessType; @Transient protected List ids; @@ -164,6 +166,14 @@ public class WxPropertyContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; + public Integer getBusinessType() { + return businessType; + } + + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } + public Map getFlowParams() { return flowParams; } 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 0a82f5943..706a87c91 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -185,6 +185,10 @@ public class WxRentContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "审核状态", name = "applyStatus") private Integer applyStatus; + // 审批流1合同2账单3终止审批 + @io.swagger.annotations.ApiModelProperty(value = "审批流类型", name = "businessType") + private Integer businessType; + @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") private String bankName; @@ -202,8 +206,13 @@ public class WxRentContract implements Serializable { private Date fixEndDate; + public Integer getBusinessType() { + return businessType; + } - + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } public Date getFixStartDate() { return fixStartDate; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java index 422364c8b..a9c36a0ff 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java @@ -11,6 +11,7 @@ public enum EnumBillRentStatus { PAID(3, "已结清"), NOT_EXPIRED(4,"未到期"), RETURN(5, "已退还"), + INVALID(6, "失效"), ; public static EnumBillRentStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumEndProperty.java b/mallinkService/src/main/java/com/iformall/enums/EnumEndProperty.java new file mode 100644 index 000000000..a2005daf7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumEndProperty.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by luozukai + * 终止合同类型 + */ +public enum EnumEndProperty { + + END_RENT(1, "终止租赁合同"), + END_RENT_AND_PROPERTY(2, "终止租赁和物业合同"), + ; + + public static EnumEndProperty getEnum(Integer code) { + for (EnumEndProperty value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumEndProperty(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 93b376d0f..55a7a7d3b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxRentContract; import java.util.List; import java.util.Map; @@ -21,7 +23,7 @@ public interface WxBillPropertyMapper extends CommonMapper void updateWaitPayStatus(Map params); - - - + void updateInvalidStatus(WxBillProperty wxBillProperty); + + void updateInvalidStatusByRent(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 16a2da283..edc675653 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -21,4 +21,5 @@ public interface WxBillRentMapper extends CommonMapper { void updateWaitPayStatus(Map params); + void updateInvalidStatus(WxBillRent wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 3be0985d3..d1b39479f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -41,4 +41,6 @@ public interface WxPropertyContractMapper extends CommonMapperbr.receive_date) a) - - - - + + + + update wx_bill_property set status = 6 where property_contract_id = #{propertyContractId} + and status = 4 + + + + update wx_bill_property set status = 6 where property_contract_id in + (select id from wx_property_contract where rent_contract_id = #{id}) + and status = 4 + + + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 5435a9bc0..6abc786ab 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -118,6 +118,12 @@ where br.tenant_id=#{tenantId} and br.status!=#{paid} and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) + + + + update wx_bill_rent set status = 6 where rent_contract_id = #{rentContractId} + and status = 4 + diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 928418840..ce5421d95 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -34,8 +34,8 @@ - - + + @@ -44,7 +44,7 @@ `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`, `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, - `start_date`,`end_date`,`apply_status`,`adjust_period` + `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type` @@ -103,7 +103,7 @@ f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName, - s.addr,rc.apply_status applyStatus,rc.adjust_period adjustPeriod + s.addr,rc.apply_status applyStatus,rc.adjust_period adjustPeriod,rc.business_type businessType from wx_property_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_floor f on s.floor=f.id @@ -181,13 +181,20 @@ - update wx_property_contract set apply_status=#{applyStatus} where id=#{id} + update wx_property_contract set apply_status=#{applyStatus} + ,set business_type=#{businessType} + where id=#{id} update wx_property_contract set status=#{status} where id=#{id} + + + update wx_property_contract set status=#{status} where rent_contract_id=#{rentContractId} + +