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 af48b8d52..7140e88c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -109,12 +109,9 @@ public class WxRentContractController extends WxContractBaseController { // if (wxMerchantService.hasMerchant(wxMerchant)) { // return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); // } - //查询商户是否存在计租中合同 - if (!wxRentContractService.hasContract(wxRentContract)){ - return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT); - } MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); + //wxRentContract.setTenantId("789"); wxRentContract.setAdjustPeriodHandle(); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index 2f6ad8ea2..e9ec4092a 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -38,9 +38,9 @@ ALTER TABLE `wx_coupon_order` ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class'; UPDATE wx_coupon_order o INNER JOIN wx_pay_order po ON po.order_id = o.`id` SET o.pay_vendor = po.pay_vendor; - ---刷新完之后把DEFAULT 1 去掉 + ALTER TABLE `wx_card_spend` ADD COLUMN `remark` VARCHAR(30) DEFAULT NULL COMMENT '备注'; @@ -50,13 +50,23 @@ ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT 'app平台 1:微信 2: ALTER TABLE `wx_profit_sharing_receiver` ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿里 3:头条'; - +create table wx_rent_contract_20200826 like wx_rent_contract; +insert into wx_rent_contract_20200826 select * from wx_rent_contract; ALTER TABLE wx_rent_contract DROP COLUMN shop_id; +create table wx_property_contract_20200826 like wx_property_contract; +insert into wx_property_contract_20200826 select * from wx_property_contract; + +ALTER TABLE wx_property_contract DROP COLUMN shop_id; ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称'; ALTER TABLE `wx_rent_contract` ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; +合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。 + + + + diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index a4fe96b5e..adb57245e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -79,7 +79,7 @@ public interface WxRentContractMapper extends CommonMapper List getAllContractBymerchantId(WxRentContract wxRentContract); - List getContractByMerchant(WxRentContract wxRentContract); + //List getContractByMerchant(WxRentContract wxRentContract); Integer getCanApplyCount(@Param("id") Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 4192c97be..c5c042694 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -104,8 +104,6 @@ public interface WxRentContractService { ResultData apply(WxRentContract wxRentContract,MallUserInfo user); - boolean hasContract(WxRentContract wxRentContract); - /** * 合同正常到期 * @param wxRentContract 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 20e75018b..7ee958a12 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2492,15 +2492,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } - @Override - public boolean hasContract(WxRentContract wxRentContract) { - List list = wxRentContractMapper.getContractByMerchant(wxRentContract); - if (list.isEmpty()){ - return true; - } - return false; - } - @Override public void outDateContract(WxMall wxMall) { //查询有计租合同的商户 diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 5899aaef4..334e09bdf 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -668,9 +668,9 @@ ) --> - select count(1) from wx_rent_contract where id != #{id} and (status=1 or (status=10 and apply_status=3) )