From ee97261b942ec48c30b15ba43c400838c68d4d27 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 22 Sep 2024 10:28:50 +0800 Subject: [PATCH] fix --- .../controller/contract/WxPropertyContractController.java | 4 ++++ .../controller/contract/WxRentContractController.java | 3 +++ .../src/main/resources/db/migration/V202409000000001.sql | 6 ++++++ .../java/com/iformall/domain/po/WxPropertyContract.java | 2 ++ .../main/java/com/iformall/domain/po/WxRentContract.java | 2 ++ .../iformall/service/impl/WxRentContractServiceImpl.java | 4 +++- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 +++- .../src/main/resources/mapper/WxRentContractMapper.xml | 5 +++-- 8 files changed, 26 insertions(+), 4 deletions(-) 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 6c0e48733..1a54f02f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -82,6 +82,9 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes()); } + if (null == wxPropertyContract.getIsPrivateMerchant()) { + wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); + } PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; if (null != pageInfo && null != pageInfo.getList()) { @@ -210,6 +213,7 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setLinkPerson(merchant.getLinkPerson()); wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); //wxPropertyContract.setRentShopType(merchant.getType()); + wxPropertyContract.setIsPrivateMerchant(merchant.getIsPrivate()); wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); 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 84d00cc6d..bc092de42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -78,6 +78,9 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); } + if (null == wxRentContract.getIsPrivateMerchant()) { + wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); + } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index 0fe88117c..cc5ca87c5 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -270,5 +270,11 @@ CREATE TABLE `wx_shop_users_person` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='商铺'; +ALTER TABLE wx_rent_contract ADD is_private_merchant INT(1) NOT NULL DEFAULT 0 COMMENT '是否私密商户' AFTER merchant_id; +ALTER TABLE wx_property_contract ADD is_private_merchant INT(1) NOT NULL DEFAULT 0 COMMENT '是否私密商户' AFTER merchant_id; + + + + 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 705e6ac18..fa30466a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -55,6 +55,8 @@ public class WxPropertyContract extends TenantEntity { private Integer decimalSize = 2; @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") + private Integer isPrivateMerchant; /*月租金/分成(分)**/ @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") private String price; 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 8aba4f8eb..ca818bd14 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -228,6 +228,8 @@ public class WxRentContract extends TenantEntity { private Integer decimalSize = Constant.default_short_decimal_size ; @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") + private Integer isPrivateMerchant; @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") private String price; @TableField(exist = false) 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 81281edc5..d955d5879 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -429,7 +429,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { shopName = shopName +","+ shopNumber; } } - + // + WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId()); + record.setIsPrivateMerchant(merchant.getIsPrivate()); try { record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); record.setStatus(EnumRentContractStatus.UNWRITE.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 06de4dcc8..f7871797e 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -4,6 +4,7 @@ + @@ -71,7 +72,7 @@ - `id`,`merchant_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`, + `id`,`merchant_id`,`is_private_merchant`,`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`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, @@ -84,6 +85,7 @@ where 1 = 1 and `id` = #{id} and `merchant_id` = #{merchantId} + and `is_private_merchant` = #{isPrivateMerchant} and `price` = #{price} and `rental_start_date` = #{rentalStartDate} and `rental_end_date` = #{rentalEndDate} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index aec7ac553..779caa035 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -4,7 +4,7 @@ - + @@ -132,7 +132,7 @@ - `id`,`merchant_id`, + `id`,`merchant_id`,`is_private_merchant`, `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, `decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, @@ -155,6 +155,7 @@ and `id` = #{id} and `from_id` = #{fromId} and `merchant_id` = #{merchantId} + and `is_private_merchant` = #{isPrivateMerchant} and `price` = #{price} and `rental_start_date` = #{rentalStartDate} and `rental_end_date` = #{rentalEndDate}