Просмотр исходного кода

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
09ea1fb326
4 измененных файлов: 23 добавлений и 15 удалений
  1. +15
    -7
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

+ 15
- 7
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; create table wx_rent_contract_20200826 like wx_rent_contract;
insert into wx_rent_contract_20200826 select * from 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; ALTER TABLE wx_rent_contract DROP COLUMN shop_id;


create table wx_property_contract_20200826 like wx_property_contract; 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_property_contract DROP COLUMN shop_id;


ALTER TABLE `wx_rent_contract` ADD COLUMN `shop_name` VARCHAR(100) COMMENT '店铺名称';


//待刷语句 //待刷语句
//刷shop_name字段,合同状态为4(即将到期)更新为计租中,合同状态为8(补录),9(续签)更新为草稿。租金合同rentinfo //刷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_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_property_contract SET STATUS = 3 WHERE STATUS = 4;


UPDATE wx_rent_contract SET STATUS = 1 WHERE STATUS = 8 AND apply_status = 0; 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 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` ALTER TABLE `wx_rent_contract`
ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签,从哪个合同续签'; 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` ALTER TABLE `wx_c_user_car`


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -460,7 +460,6 @@ public class WxMerchantServiceImpl implements WxMerchantService {
Date date = new Date(); Date date = new Date();
wxMerchant.setUpdateDate(date); wxMerchant.setUpdateDate(date);
wxMerchantMapper.updateById(wxMerchant); wxMerchantMapper.updateById(wxMerchant);
//更新商户的商铺
wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId());
List<Long> shopIds = wxMerchant.getShopids(); List<Long> shopIds = wxMerchant.getShopids();
for (Long sid: shopIds) { for (Long sid: shopIds) {


+ 4
- 4
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 + " 已删除"); return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除");
} }
wxRentContractQuery.setId(record.getId()); 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) { if (record.getMerchantId() != null) {
WxMerchantShop wxMerchantShop = new WxMerchantShop(); WxMerchantShop wxMerchantShop = new WxMerchantShop();
wxMerchantShop.setShopId(shopId); wxMerchantShop.setShopId(shopId);


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Просмотреть файл

@@ -162,10 +162,11 @@ public class WxShopServiceImpl implements WxShopService {
updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode()); updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode());
wxMerchantShopMapper.updateById(updateMerchantShop); wxMerchantShopMapper.updateById(updateMerchantShop);
} }
} else {
}
//else {
//无关联商铺直接删除 //无关联商铺直接删除
wxShopMapper.deleteById(id);
}
//wxShopMapper.deleteById(id);
//}
return new ResultData(Result.SUCCESS, "删除成功"); return new ResultData(Result.SUCCESS, "删除成功");
} }




Загрузка…
Отмена
Сохранить