From 09ea1fb326686c986c12cd0f428f44fe43925e31 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 26 Aug 2020 14:47:25 +0800 Subject: [PATCH] fix contract --- .../V202007311200__FOR_MEMBER_ONLY_001.sql | 22 +++++++++++++------ .../service/impl/WxMerchantServiceImpl.java | 1 - .../impl/WxRentContractServiceImpl.java | 8 +++---- .../service/impl/WxShopServiceImpl.java | 7 +++--- 4 files changed, 23 insertions(+), 15 deletions(-) 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 0b4cb79af..89a960f91 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 @@ -54,6 +54,15 @@ ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿 create table wx_rent_contract_20200826 like wx_rent_contract; insert into wx_rent_contract_20200826 select * from wx_rent_contract; +//更新多经点的合同的rentInfo +UPDATE wx_rent_contract wrc INNER JOIN wx_shop s ON wrc.shop_id = s.id +SET rent_info = JSON_ARRAY(JSON_OBJECT("id",s.id,"pointType",s.`point_type`,"addr",s.`addr`,"type",s.`type`,"floor",s.`floor`,"price","NAN","imgUrl",s.`img_url`,"shopId",s.id,"status",s.`status`,"deposit",wrc.`deposit`,"manager",s.`manager`,"building",s.`building`,"rentArea",wrc.`rent_area`,"buildArea",s.`build_area`,"shopNumber",s.`shop_number`,"adjustRatio",'[]',"managerPhone",s.`manager_phone`,"operationArea",s.`operation_area`)) +WHERE wrc.rent_info IS NULL AND wrc.shop_id IS NOT NULL ; + +//删除店铺不存在的垃圾数据 +DELETE FROM wx_rent_contract WHERE shop_id IS NOT NULL AND shop_id NOT IN (SELECT id FROM wx_shop); + + ALTER TABLE wx_rent_contract DROP COLUMN shop_id; create table wx_property_contract_20200826 like wx_property_contract; @@ -61,11 +70,13 @@ 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 '店铺名称'; //待刷语句 //刷shop_name字段,合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。租金合同rentinfo UPDATE wx_rent_contract SET STATUS = 3 , apply_status = 2 WHERE STATUS = 4 AND apply_status = 1; +UPDATE wx_property_contract SET STATUS = 3 , apply_status = 2 WHERE STATUS = 4 AND apply_status = 1; + +UPDATE wx_rent_contract SET STATUS = 3 WHERE STATUS = 4; UPDATE wx_property_contract SET STATUS = 3 WHERE STATUS = 4; UPDATE wx_rent_contract SET STATUS = 1 WHERE STATUS = 8 AND apply_status = 0; @@ -73,16 +84,13 @@ UPDATE wx_rent_contract SET STATUS = 10 WHERE STATUS = 8 AND apply_status = 1; UPDATE wx_rent_contract SET STATUS = 1 WHERE STATUS = 9; -UPDATE wx_rent_contract wrc INNER JOIN wx_shop s ON wrc.shop_id = s.id SET rent_info = JSON_ARRAY(s.*) WHERE wrc.rent_info IS NULL; - - - - - +delete from wx_rent_contract where status = 0; ALTER TABLE `wx_rent_contract` ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; +ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称'; + ALTER TABLE `wx_c_user_car` diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index f6f7f2f48..f71151343 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -460,7 +460,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateById(wxMerchant); - //更新商户的商铺 wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); List shopIds = wxMerchant.getShopids(); for (Long sid: shopIds) { 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 b603c9cfb..981ebd316 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -681,10 +681,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); } wxRentContractQuery.setId(record.getId()); - int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContractQuery.getTenantId(),wxRentContractQuery.getParentTenantId(),shopId,wxRentContractQuery.getId()); - if (count > 0) { - return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); - } + //int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContractQuery.getTenantId(),wxRentContractQuery.getParentTenantId(),shopId,wxRentContractQuery.getId()); + //if (count > 0) { + // return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); + //} if (record.getMerchantId() != null) { WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setShopId(shopId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 4bcfc628a..44cd55d08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -162,10 +162,11 @@ public class WxShopServiceImpl implements WxShopService { updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode()); wxMerchantShopMapper.updateById(updateMerchantShop); } - } else { + } + //else { //无关联商铺直接删除 - wxShopMapper.deleteById(id); - } + //wxShopMapper.deleteById(id); + //} return new ResultData(Result.SUCCESS, "删除成功"); }