diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index c9f7bf37d..22ddd0546 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -59,11 +59,7 @@ public class WxContractBaseController extends BaseController{ protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) { WxFlowModel wxFlowModel = new WxFlowModel(); - if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } + wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); wxFlowModel.updateTenantInfo(rpvo); List flows = wxFlowService.getModelBybusiness(wxFlowModel); if (null != flows && flows.size() > 0) { @@ -77,17 +73,9 @@ public class WxContractBaseController extends BaseController{ WxFlowModel wxFlowModel = new WxFlowModel(); if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() || wxRentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) { - if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); - }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode()); - } + wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); }else { - if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } + wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); } wxFlowModel.updateTenantInfo(wxRentContract); List flows = wxFlowService.getModelBybusiness(wxFlowModel); @@ -100,17 +88,9 @@ public class WxContractBaseController extends BaseController{ protected boolean propertyContractHasWorkFlow(WxPropertyContract wxPropertyContract) { WxFlowModel wxFlowModel = new WxFlowModel(); if(wxPropertyContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { - if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode()); - }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode()); - } + wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode()); }else { - if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } + wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); } wxFlowModel.updateTenantInfo(wxPropertyContract); List flows = wxFlowService.getModelBybusiness(wxFlowModel); 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 3154eefb2..6c0e48733 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -150,9 +150,6 @@ public class WxPropertyContractController extends WxContractBaseController { if (null == wxPropertyContract.getOperationType()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "operationType不能为空"); } - if (null == wxPropertyContract.getRentShopType()) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "rentShopType不能为空"); - } if (null == wxPropertyContract.getAdjustPeriod()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空"); } @@ -200,7 +197,6 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setSignDate(rentContract.getSignDate()); wxPropertyContract.setRentInfo(rentContract.getRentInfo()); wxPropertyContract.setShopNumbers(rentContract.getRentInfoShopNumber()); - wxPropertyContract.setRentShopType(rentContract.getRentShopType()); } WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId()); @@ -215,8 +211,6 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); //wxPropertyContract.setRentShopType(merchant.getType()); - Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); - wxPropertyContract.setContractType(contractType); wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); } @@ -474,17 +468,9 @@ public class WxPropertyContractController extends WxContractBaseController { remark = (String) map.get("remark"); } if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { - if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, remark, contract.getId(),null)); - }else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.PROPERTY_POINT, remark, contract.getId(),null)); - } + contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, remark, contract.getId(),null)); }else { - if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, remark, contract.getId(),null)); - }else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, remark, contract.getId(),null)); - } + contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, remark, contract.getId(),null)); } return wxPropertyContractService.apply(contract,user); } 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 9e6ee4cd8..84d00cc6d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -104,8 +104,6 @@ public class WxRentContractController extends WxContractBaseController { @PostMapping("add") public ResultData add(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); - Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); - wxRentContract.setContractType(contractType); //WxMerchant wxMerchant = new WxMerchant(); //wxMerchant.setName(wxRentContract.getMerchantName()); //wxMerchant.setId(wxRentContract.getMerchantId()); @@ -174,7 +172,6 @@ public class WxRentContractController extends WxContractBaseController { if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - wxRentContract.setRentShopType(null); wxRentContract.setOperationType(null); if (null == wxRentContract.getDayPriceCalcute()){ wxRentContract.setDayPriceCalcute(EnumRentDayPriceCalcute.REAL_DAYS.getCode()); @@ -612,17 +609,9 @@ public class WxRentContractController extends WxContractBaseController { if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() || rentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) { - if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT, wxRentContract.getRemark(), wxRentContract.getId(),null)); - }else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_SHOP_CONTRACT, EnumFlowContractType.RENT_POINT, wxRentContract.getRemark(), wxRentContract.getId(),null)); - } + rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT, wxRentContract.getRemark(), wxRentContract.getId(),null)); }else if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){ - if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); - }else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); - } + rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); }else { return new ResultData(Result.ERROR,"合同操作类型非法。"); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index 9b070af57..8546cec49 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -104,3 +104,113 @@ ALTER TABLE wx_finance_receive_97 DROP COLUMN rent_shop_type; ALTER TABLE wx_finance_receive_98 DROP COLUMN rent_shop_type; ALTER TABLE wx_finance_receive_99 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_0 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_1 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_2 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_3 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_4 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_5 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_6 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_7 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_8 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_9 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_10 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_11 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_12 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_13 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_14 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_15 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_16 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_17 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_18 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_19 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_20 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_21 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_22 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_23 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_24 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_25 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_26 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_27 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_28 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_29 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_30 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_31 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_32 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_33 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_34 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_35 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_36 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_37 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_38 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_39 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_40 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_41 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_42 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_43 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_44 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_45 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_46 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_47 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_48 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_49 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_50 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_51 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_52 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_53 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_54 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_55 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_56 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_57 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_58 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_59 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_60 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_61 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_62 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_63 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_64 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_65 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_66 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_67 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_68 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_69 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_70 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_71 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_72 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_73 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_74 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_75 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_76 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_77 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_78 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_79 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_80 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_81 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_82 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_83 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_84 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_85 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_86 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_87 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_88 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_89 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_90 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_91 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_92 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_93 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_94 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_95 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_96 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_97 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_98 DROP COLUMN rent_shop_type; +ALTER TABLE wx_all_bill_99 DROP COLUMN rent_shop_type; + +DELETE FROM wx_flow_config WHERE NAME IN ('多经点位租金合同签约','多经点位租金合同终止','多经点位物业合同签约','多经点位物业合同终止','多经点位租金+物业合同签约','多经点位租金+物业合同终止'); + +ALTER TABLE wx_rent_contract DROP COLUMN rent_shop_type; +ALTER TABLE wx_rent_contract DROP COLUMN contract_type; + +ALTER TABLE wx_property_contract DROP COLUMN rent_shop_type; +ALTER TABLE wx_property_contract DROP COLUMN contract_type; + + 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 666097714..705e6ac18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -158,9 +158,6 @@ public class WxPropertyContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") private Date endContractTime; - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") - private Integer rentShopType; - @io.swagger.annotations.ApiModelProperty(value = "计租周期EnumRentContractAdjustPeriod", name = "计租周期") private Integer adjustPeriod; @@ -365,11 +362,7 @@ public class WxPropertyContract extends TenantEntity { } return null; } - - @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType") - private Integer contractType; - @TableField(exist = false) private List merchantIds; 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 f449f24f4..8aba4f8eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -350,8 +350,8 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") private Date endContractTime; - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") - private Integer rentShopType; +// @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") +// private Integer rentShopType; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") @@ -517,8 +517,8 @@ public class WxRentContract extends TenantEntity { } - @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType") - private Integer contractType; +// @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType") +// private Integer contractType; //联营扣点跳点设置 @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumContract.java b/mallinkService/src/main/java/com/iformall/enums/EnumContract.java index d10a7f020..37f618bab 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumContract.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumContract.java @@ -7,12 +7,12 @@ package com.iformall.enums; public enum EnumContract { - SHOP_RENT(1, "店铺租赁合同"), - SHOP_PROPERTY(3, "店铺物业合同"), - SHOP_RENT_PROPERTY(5, "店铺租赁物业合同"), - POINT_RENT(2, "多经租赁合同"), - POINT_PROPERTY(4, "多经物业合同"), - POINT_RENT_PROPERTY(6, "多经租赁物业合同"),; + SHOP_RENT(1, "租赁合同"), + SHOP_PROPERTY(3, "物业合同"), + SHOP_RENT_PROPERTY(5, "租赁物业合同"); + //POINT_RENT(2, "多经租赁合同"), + //POINT_PROPERTY(4, "多经物业合同"), + //POINT_RENT_PROPERTY(6, "多经租赁物业合同"),; public static EnumContract getEnum(Integer code) { for (EnumContract value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumContractOperationType.java b/mallinkService/src/main/java/com/iformall/enums/EnumContractOperationType.java index e306a7fc5..62dad2138 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumContractOperationType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumContractOperationType.java @@ -9,7 +9,7 @@ public enum EnumContractOperationType { PART(1, "区分租赁物业"), WHOLE(2, "合并租赁物业"), - JINMAO(3, "金茂"),;; + JINMAO(3, "金茂"); public static EnumContractOperationType getEnum(Integer code) { for (EnumContractOperationType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java index 908a3ce8b..f9dcead90 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java @@ -9,11 +9,8 @@ public enum EnumFlowContractType { // 1租赁合同 2点位合同 3物业 4点位物业合同 RENT(1, "租赁合同"), - RENT_POINT(2, "租赁点位合同"), PROPERTY(3,"物业合同"), - PROPERTY_POINT(4, "点位物业合同"), - WHOLE_SHOP(5, "合并合同(店铺)"), - WHOLE_POINT(6, "合并合同(点位)") + WHOLE_SHOP(5, "合并合同(店铺)") ; public static EnumFlowContractType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index 8ecda8385..3404c1c76 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -9,10 +9,10 @@ public enum EnumFlowKey { BILL(2, "end_bill_flow"),//账单审批 END_CONTRACT(3, "end_contract_flow"),//终止合同审批 - NEW_RENT_CONTRACT(4, "商铺租金合同签约"), - NEW_SHOP_CONTRACT(5, "多经点位租金合同签约"), - NEW_RENT_END_CONTRACT(6, "商铺租金合同终止"), - NEW_SHOP_END_CONTRACT(7, "多经点位租金合同终止"), + NEW_RENT_CONTRACT(4, "租金合同签约"), + //NEW_SHOP_CONTRACT(5, "多经点位租金合同签约"), + NEW_RENT_END_CONTRACT(6, "租金合同终止"), + //NEW_SHOP_END_CONTRACT(7, "多经点位租金合同终止"), NEW_BILL_CHANGE(8, "账单应收金额变更"), @@ -26,15 +26,15 @@ public enum EnumFlowKey { NEW_COUPON_DISTRIBUTION_UPLINE(25,"配送商品审批"), NEW_COUPON_CREDIT_UPLINE(26,"积分券审批"), - NEW_PRO_CONTRACT(13, "商铺物业合同签约"), - NEW_PRO_END(14, "商铺物业合同终止"), - NEW_PRO_POINT_CONTRACT(15, "多经点位物业合同签约"), - NEW_PRO_POINT_CONTRACT_END(16, "多经点位物业合同终止"), + NEW_PRO_CONTRACT(13, "物业合同签约"), + NEW_PRO_END(14, "物业合同终止"), + //NEW_PRO_POINT_CONTRACT(15, "多经点位物业合同签约"), + //NEW_PRO_POINT_CONTRACT_END(16, "多经点位物业合同终止"), - NNEW_RENT_CONTRACT(17, "商铺租金+物业合同签约"), - NEW_RENT_END(18, "商铺租金+物业合同合同终止"), - NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租金+物业合同签约"), - NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租金+物业合同终止"), + NNEW_RENT_CONTRACT(17, "租金+物业合同签约"), + NEW_RENT_END(18, "租金+物业合同合同终止"), + //NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租金+物业合同签约"), + //NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租金+物业合同终止"), SETTLE(21,"结算单审批"), BILL_FINISH(30,"商户账单完结审批"), diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 5b2677fda..979173f26 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -57,17 +57,6 @@ public interface WxPropertyContractService { void download(HttpServletRequest request, HttpServletResponse response); - //Object getRentContractStatusInfo(WxPropertyContract record); - - //ResultData endRentContract(Long id); - - //Object getRentContractList(WxPropertyContract record); - - - //ResultData endPropertyContractByRentContractId(Long rentContractId); - - ResultData hasRentContract(Long rentContractId); - ResultData updatePropertyContractStatus(Long id); void endContract(WxPropertyContract wxPropertyContract,MallUserInfo userInfo); @@ -76,8 +65,6 @@ public interface WxPropertyContractService { List getWxBillPropertyPreview(TenantEntity tenantEntity,Long id); - //Map updateStatus(WxPropertyContract record); - List buildProperty(WxMerchant wxMerchant, MallUserInfo user, WxPropertyContract propertyContract, Integer isPreview,boolean saveDb); WxPropertyContract getByBill(WxAllBill billRent); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java index a64150aeb..285f4232b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java @@ -18,6 +18,4 @@ public interface WxRentPropertyContractService { ResultData insertRentForCreate(WxRentContract wxRentContract); - Integer getContractType(Integer rentShopType, Integer operationType, Integer contract); - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index d46044743..f639fbeb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -183,17 +183,12 @@ public class WxFlowServiceImpl implements WxFlowService { if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || - EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)|| EnumFlowKey.NEW_PRO_CONTRACT.getCode().equals(flowType)|| - EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().equals(flowType)|| - EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType)|| - EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().equals(flowType) + EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType) ){ // 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位 if (EnumFlowContractType.RENT.getCode().equals(contractType) || - EnumFlowContractType.RENT_POINT.getCode().equals(contractType) || - EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType) || - EnumFlowContractType.WHOLE_POINT.getCode().equals(contractType)) { + EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType)) { WxRentContract rent = new WxRentContract(); //租金+合同的bussinessId 特殊 @@ -254,7 +249,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContractMapper.updateApplyStatusByRentContractId(wxPropertyContract); } - }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ + }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType)){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setId(Long.parseLong(businessId)); wxPropertyContract.setApplyStatus(applyStatus); @@ -276,17 +271,11 @@ public class WxFlowServiceImpl implements WxFlowService { } }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_PRO_END.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_POINT_CONTRACT_END.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_POINT_CONTRACT_END.getCode().equals(flowType) ){ if(EnumFlowContractType.RENT.getCode().equals(contractType) || - EnumFlowContractType.RENT_POINT.getCode().equals(contractType) || - EnumFlowContractType.RENT_POINT.getCode().equals(contractType) || - EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType) || - EnumFlowContractType.WHOLE_POINT.getCode().equals(contractType)){ + EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType)) { WxRentContract rent = new WxRentContract(); //租金+合同的bussinessId 特殊 Long bsId ; @@ -311,7 +300,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxRentContractService.endContract(rent,null); } wxRentContractService.updateApplyStatus(rent); - }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ + }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType)){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setId(Long.parseLong(businessId)); wxPropertyContract.setApplyStatus(applyStatus); @@ -774,17 +763,11 @@ public class WxFlowServiceImpl implements WxFlowService { if(EnumFlowKey.CONTRACT.getCode().equals(flowType) ||EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_PRO_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_PRO_END.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_POINT_CONTRACT_END.getCode().equals(flowType) || EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_POINT_CONTRACT_END.getCode().equals(flowType) ){ return true; } 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 a875ac68e..1bef1b332 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1051,121 +1051,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } -// @Override -// @Transactional(rollbackFor = {Exception.class}) -// public Object getRentContractStatusInfo(WxPropertyContract record) { -// -// Map resultData = new HashMap(); -// //商铺信息 -// WxShop wxShop = new WxShop(); -// wxShop.updateTenantInfo(record); -// wxShop.setType(record.getRentShopType()); -// wxShop.setStatus(EnumShopStatus.RENT.getCode()); -// List rentedList = wxShopMapper.findList(wxShop); -// wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); -// List unrentedList = wxShopMapper.findList(wxShop); -// -// HashMap shopMap = new HashMap<>(3); -// int rentedCount = rentedList.size(); -// int unrentedCount = unrentedList.size(); -// shopMap.put("rentedCount",rentedCount); -// shopMap.put("unrentedCount",unrentedCount); -// shopMap.put("allCount",rentedCount+unrentedCount); -// resultData.put("shopCountInfo", shopMap); -// -// //需要更新的状态 -// resultData.putAll(updateStatus(record)); -// return resultData; -// } - -// @Override -// public Object getRentContractList(WxPropertyContract record) { -// Map params = new HashMap<>(); -// params.put("tenantId", record.getTenantId()); -// params.put("rentShopType", record.getRentShopType()); -// List contractList; -// if (record.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { -// contractList = wxPropertyContractMapper.getRentContractListByShop(params); -// } else { -// contractList = wxPropertyContractMapper.getRentContractListByPoint(params); -// } -// return contractList; -// } - - @Override - public ResultData hasRentContract(Long rentContractId) { - if (null == rentContractId) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "rentContractId不能为空"); - } - - WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); - if (wxRentContract != null) { - WxPropertyContract wxPropertyContract = new WxPropertyContract(); - wxPropertyContract.updateTenantInfo(wxRentContract); - if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { - wxPropertyContract.setMerchantId(wxRentContract.getMerchantId()); - } -// if (wxRentContract.shopIdsByRentInfo().size()==0) { -// wxPropertyContract.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); -// } - - - List select = wxPropertyContractMapper.selectList(new QueryWrapper(wxPropertyContract)); - if (select.size() > 0) { -// long count = select.stream().filter(propertyContract -> propertyContract.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || -// propertyContract.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || -// propertyContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); - - long count = select.stream().filter(propertyContract -> EnumRentContractStatus.getValidStatus().contains(propertyContract.getStatus())).count(); - if (count > 0) { - return new ResultData(true); - } - } - } - return new ResultData(false); - } - -// @Override -// public Map updateStatus(WxPropertyContract record) { -// Map resultData = new HashMap(); -// WxPropertyContract wxPropertyContract = new WxPropertyContract(); -// wxPropertyContract.updateTenantInfo(record); -// wxPropertyContract.setRentShopType(record.getRentShopType()); -// -// int allCount = wxPropertyContractMapper.selectCount(new QueryWrapper(wxPropertyContract)); -// resultData.put("allCount", allCount); -// -// //作废合同 -// wxPropertyContract.setStatus(EnumRentContractStatus.INVALID.getCode()); -// wxPropertyContractMapper.updateRentInvalidStatus(wxPropertyContract); -// -// //待签约 -// //wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); -// //wxPropertyContractMapper.updateRentWaitSignStatus(wxPropertyContract); -// //int waitSignCount = wxPropertyContractMapper.queryRentContractWaitSignStatus(wxPropertyContract); -// resultData.put("waitSignCount", 0); -// -// //计租中 -// wxPropertyContract.setStatus(EnumRentContractStatus.PAING.getCode()); -// wxPropertyContractMapper.updateRentContractPaidStatus(wxPropertyContract); -// int rendPaidCount = wxPropertyContractMapper.queryRentContractPaidStatus(wxPropertyContract); -// resultData.put("rendPaidCount", rendPaidCount); -// -// //将到期 -// //wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); -// //wxPropertyContractMapper.updateRentContractEndSoonStatus(wxPropertyContract); -// //int endSoonCount = wxPropertyContractMapper.queryRentContractEndSoonStatus(wxPropertyContract); -// resultData.put("endSoonCount", 0); -// -// //到期 -// wxPropertyContract.setStatus(EnumRentContractStatus.OUT_DATE.getCode()); -// int endCount = wxPropertyContractMapper.queryRentContractEndStatus(wxPropertyContract); -// wxPropertyContractMapper.updateRentContractEndStatus(wxPropertyContract); -// resultData.put("endCount", endCount); -// -// return resultData; -// } - public static void downLoadFromUrl(String urlStr, String fileName, String savePath) throws IOException { URL url = new URL(urlStr); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); 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 cc0a12f43..a09cfab79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -790,7 +790,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //重新查一次 wxRentContract = wxRentContractMapper.selectById(record.getId()); - record.setRentShopType(wxRentContract.getRentShopType()); return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract); } @@ -869,18 +868,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillDeposit.setUpdateByName(user.getName()); } //wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { - String rentInfo = wxRentContract.getRentInfo(); - if (rentInfo != null) { - JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); - Map shopInfo = new HashMap<>(); - for (int i = 0, size = rentInfoArray.size(); i < size; i++) { - JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); - shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit")); - } - wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo)); - } - } + String rentInfo = wxRentContract.getRentInfo(); + if (rentInfo != null) { + JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); + Map shopInfo = new HashMap<>(); + for (int i = 0, size = rentInfoArray.size(); i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("deposit")); + } + wxBillDeposit.setShopInfo(JSONObject.toJSONString(shopInfo)); + } wxBillDeposit.setEnergyFeesId(energyFeesId); insertList.add(wxBillDeposit); @@ -956,33 +953,21 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("合同id:{},开始停止...", id); //结束审批流 by luozukai WxFlowModel flowModel = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_CONTRACT.getCode().intValue(),record); - WxFlowModel flowModelPoint = wxFlowService.getModelByType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode().intValue(),record); WxFlowModel flowModel_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_CONTRACT.getCode().intValue(),record); - WxFlowModel flowModelPoint_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().intValue(),record); WxFlowModel flowModel_rent = wxFlowService.getModelByType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode().intValue(),record); - WxFlowModel flowModelPoint_rent = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().intValue(),record); List keyList = new ArrayList<>(); if(flowModel != null){ keyList.add(flowModel.getFlowId()); } - if(flowModelPoint != null){ - keyList.add(flowModelPoint.getFlowId()); - } if(flowModel_pro != null){ keyList.add(flowModel_pro.getFlowId()); } - if(flowModelPoint_pro != null){ - keyList.add(flowModelPoint_pro.getFlowId()); - } if(flowModel_rent != null){ keyList.add(flowModel_rent.getFlowId()); } - if(flowModelPoint_rent != null){ - keyList.add(flowModelPoint_rent.getFlowId()); - } keyList.add(EnumFlowKey.CONTRACT.getMessage()); List tasks = taskService.createTaskQuery() .processDefinitionKeyIn(keyList) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 76051827e..af40e676f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -120,45 +120,6 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract public ResultData insertRentForCreate(WxRentContract wxRentContract) { return null; } - - @Override - public Integer getContractType(Integer rentShopType, Integer operationType, Integer contract) { - //店铺租赁合同 - if (contract.equals(EnumContractType.RENT.getCode()) - && rentShopType.equals(EnumRentShopType.SHOP.getCode()) - && operationType.equals(EnumContractOperationType.PART.getCode())) { - return EnumContract.SHOP_RENT.getCode(); - } - //多经租赁合同 - if (contract.equals(EnumContractType.RENT.getCode()) - && rentShopType.equals(EnumRentShopType.POINT.getCode()) - && operationType.equals(EnumContractOperationType.PART.getCode())) { - return EnumContract.POINT_RENT.getCode(); - } - //店铺物业合同 - if (contract.equals(EnumContractType.PROPERTY.getCode()) - && rentShopType.equals(EnumRentShopType.SHOP.getCode()) - && operationType.equals(EnumContractOperationType.PART.getCode())) { - return EnumContract.SHOP_PROPERTY.getCode(); - } - //多经物业合同 - if (contract.equals(EnumContractType.PROPERTY.getCode()) - && rentShopType.equals(EnumRentShopType.POINT.getCode()) - && operationType.equals(EnumContractOperationType.PART.getCode())) { - return EnumContract.POINT_PROPERTY.getCode(); - } - //店铺租赁物业合同 - if (rentShopType.equals(EnumRentShopType.SHOP.getCode()) - && operationType.equals(EnumContractOperationType.WHOLE.getCode())) { - return EnumContract.SHOP_RENT_PROPERTY.getCode(); - } - //多经租赁物业合同 - if (rentShopType.equals(EnumRentShopType.POINT.getCode()) - && operationType.equals(EnumContractOperationType.WHOLE.getCode())) { - return EnumContract.POINT_RENT_PROPERTY.getCode(); - } - return 0; - } } diff --git a/mallinkService/src/main/java/com/iformall/utils/EventUtil.java b/mallinkService/src/main/java/com/iformall/utils/EventUtil.java index fe1ae3bdd..207678b23 100644 --- a/mallinkService/src/main/java/com/iformall/utils/EventUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/EventUtil.java @@ -12,13 +12,13 @@ import lombok.extern.slf4j.Slf4j; public class EventUtil { public static void publistRentEvent(WxRentContractService rentContractService, WxRentContract rentContract) { - try { - RentEventInfo rentEventInfo = RentEventInfo - .of(rentContract.getId(), rentContractService.getShopIds(rentContract), EnumRentContractStatus.getEnum(rentContract.getStatus()),rentContract.getContractType()); - InvestEvent event = new InvestEvent(rentEventInfo); - SpringContextUtils.pulish(event); - } catch (Exception e) { - log.error("publistRentEvent error", e); - } +// try { +// RentEventInfo rentEventInfo = RentEventInfo +// .of(rentContract.getId(), rentContractService.getShopIds(rentContract), EnumRentContractStatus.getEnum(rentContract.getStatus()),rentContract.getContractType()); +// InvestEvent event = new InvestEvent(rentEventInfo); +// SpringContextUtils.pulish(event); +// } catch (Exception e) { +// log.error("publistRentEvent error", e); +// } } } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 11734edac..06de4dcc8 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -45,7 +45,6 @@ - @@ -75,7 +74,7 @@ `id`,`merchant_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`, `sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`, - `shop_type`,`updatetime`,`createtime`,`rent_area`,`rent_shop_type`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, + `shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,`day_price_calcute`,`month_average_days`, `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`,fixed_price,`pay_period_rate`, `file_names`,price_unit,rent_price,subject_name,rent_start_type,`operation_type`,late_pay_ratio,late_pay_day,end_contract_time,out_date_notify_days,out_date_notify_phone @@ -121,7 +120,6 @@ and `rent_contract_id` = #{rentContractId} and `start_date` = #{startDate} and `end_date` = #{endDate} - and `rent_shop_type` = #{rentShopType} and `operation_type` = #{operationType} and `create_type` = #{createType} and `day_price_calcute` = #{dayPriceCalcute} @@ -129,9 +127,6 @@ and business_id in (${businessForRule}) - - and rent_shop_type in (${shopTypeForRule}) - and concat(',',shop_numbers,',') like concat('%,',#{queryShopNumber},',%') @@ -172,86 +167,6 @@ - - @@ -342,68 +253,6 @@ and merchant_id is null - - - - - - - update wx_property_contract set apply_status=#{applyStatus} ,business_type=#{businessType} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 9475fc6fe..e806c803a 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -74,7 +74,6 @@ - @@ -96,12 +95,6 @@ - - - - - - @@ -149,7 +142,7 @@ `brand`,`business_id`,`shop_type`,`shop_type_str`,`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`revenue_ratio`,`revenue_ratio_way`,`revenue_ratio_set`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`,`revenue_fixed_rent_price`,`revenue_rent_price`, - `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`,`pay_period_rate`, + `apply_status`,`bank_name`,`fix_start_date`,`fix_end_date`,`pay_period_rate`, `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,first_bill_receive_date, bussiness_management_fee,bussiness_management_fee_ratio_way,bussiness_management_fee_ratio, @@ -197,7 +190,6 @@ and `type` = #{type} and `start_date` = #{startDate} and `end_date` = #{endDate} - and `rent_shop_type` = #{rentShopType} and `operation_type` = #{operationType} and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) and `day_price_calcute` = #{dayPriceCalcute} @@ -214,10 +206,6 @@ and business_id in (${businessForRule}) - - and rent_shop_type in (${shopTypeForRule}) - - and merchant_id in @@ -263,10 +251,6 @@ and `parent_tenant_id` = #{parentTenantId} - - and rent_shop_type = #{rentShopType} - - @@ -300,7 +284,6 @@ resultType="com.iformall.domain.po.WxRentContract"> select from wx_rent_contract where status in(2,3,4) and merchant_id not in(select merchant_id from wx_property_contract where status in(2,3,4)) - and rent_shop_type = #{rentShopType} select rc.id,rc.tenant_id,rc.parent_tenant_id,rc.id as rent_id, pc.id as property_id, rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, rc.price as rent_price,rc.contract_number,rc.shop_name,rc.type,rc.apply_status,rc.price_detail,rc.revenue_fixed_rent_price,rc.revenue_rent_price, - rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status, + rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status, rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit,rc.day_price_calcute,rc.free_period_remark, rc.business_type businessType,rc.month_average_days,rc.revenue_jumps_remark,rc.first_bill_date_start,rc.first_bill_date_end from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id @@ -436,9 +418,6 @@ --> and rc.`status` = #{status} and rc.`type` = #{type} - - and rc.`rent_shop_type` = #{rentShopType} - and rc.`apply_status` = #{applyStatus} and rc.`operation_type` = #{operationType} and rc.`day_price_calcute` = #{dayPriceCalcute} @@ -446,9 +425,6 @@ and rc.business_id in (${businessForRule}) - - and rc.rent_shop_type in (${shopTypeForRule}) - and rc.merchant_id in @@ -507,7 +483,7 @@ rc.`brand`,rc.`business_id`,rc.`shop_type`,rc.`shop_type_str`,rc.`updatetime`,rc.`createtime`,rc.`link_person`,rc.`link_phone`,rc.`link_address`, rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`, rc.`start_date`,rc.`end_date`,rc.`shop_name`,rc.`from_id`,`rc.end_contract_time`,rc.`revenue_jumps_remark`, - rc.`apply_status`,rc.`bank_name`,rc.`rent_shop_type`,rc.`fix_start_date`,rc.`fix_end_date`, + rc.`apply_status`,rc.`bank_name`,rc.`fix_start_date`,rc.`fix_end_date`, rc.`business_type`,rc.`rent_info`, rc.`file_names`,rc.price_unit,rent_price,rc.other_rent_price_info,rc.`subject_name`,rc.rent_start_type, rc.`rent_input_way`,rc.`adjust_ratio_way`,rc.`operation_type`,rc.late_pay_ratio,rc.late_pay_day, rc.bussiness_management_fee,rc.bussiness_management_fee_ratio_way,rc.bussiness_management_fee_ratio, @@ -534,7 +510,7 @@ rc.`brand`,rc.`business_id`,rc.`shop_type`,rc.`shop_type_str`,rc.`updatetime`,rc.`createtime`,rc.`link_person`,rc.`link_phone`,rc.`link_address`, rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`, rc.`start_date`,rc.`end_date`,rc.`shop_name`,rc.`from_id`,rc.`end_contract_time`, - rc.`apply_status`,rc.`bank_name`,rc.`rent_shop_type`,rc.`fix_start_date`,rc.`fix_end_date`, + rc.`apply_status`,rc.`bank_name`,rc.`fix_start_date`,rc.`fix_end_date`, rc.`business_type`,rc.`rent_info`, rc.`file_names`,rc.price_unit,rent_price,rc.other_rent_price_info,rc.`subject_name`,rc.rent_start_type, rc.`rent_input_way`,rc.`adjust_ratio_way`,rc.`operation_type`,rc.late_pay_ratio,rc.late_pay_day, rc.bussiness_management_fee,rc.bussiness_management_fee_ratio_way,rc.bussiness_management_fee_ratio, @@ -562,7 +538,6 @@