From cd5543a3e5b3dcab3c42150207b9b8f2629ca0e4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 26 Aug 2020 16:28:01 +0800 Subject: [PATCH] fix contract --- .../contract/WxPropertyContractController.java | 2 ++ .../db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql | 9 ++++++++- .../iformall/schedule/CouponOrderExpiringSchedule.java | 2 +- .../java/com/iformall/schedule/DaliyAmountSchedule.java | 2 +- 4 files changed, 12 insertions(+), 3 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 4e8b6ddd2..dd3f4ce5f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumContractType; import com.iformall.enums.EnumFlowContractType; @@ -70,6 +71,7 @@ public class WxPropertyContractController extends WxContractBaseController { } wxPropertyContract.updateTenantInfo(getTenantInfo()); Map result = new HashMap<>(); + wxPropertyContract.setSortColumns(SortField.Createtime_DESC); PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; if (null != pageInfo && null != pageInfo.getList()) { 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 89a960f91..d5cc80df0 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 @@ -59,8 +59,15 @@ 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); +//删除商户不存在得垃圾数据(先查询!!!!) +delete from wx_rent_contract where merchant_id IS NOT NULL AND merchant_id not in ( select id from wx_merchant ); + +//删除租金合同不在的物业合同 +delete from wx_property_contract where rent_contract_id is not null and rent_contract_id not in ( + select id from wx_rent_contract +) ALTER TABLE wx_rent_contract DROP COLUMN shop_id; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index a1f0d9337..c55fb262e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -48,7 +48,7 @@ public class CouponOrderExpiringSchedule { @Autowired private WxOrderService wxOrderService; - @Scheduled(cron = "0 0/5 * * * ?") // 每天凌晨00:05 + @Scheduled(cron = "0 0 5 * * ?") // 每天凌晨00:05 // @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void couponOrderExpiringSchedule() { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index e23486522..b2ee3d1fa 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -94,7 +94,7 @@ public class DaliyAmountSchedule { } - @Scheduled(cron = "0 0/5 * * * ?") // 每天凌晨1点盘点前一天的数据 + @Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点盘点前一天的数据 //@Scheduled(cron = "0 0 1 * * ?") // 测试10秒中一次 public void daliyAmountSchedule() { List mallList = wxMallMapper.findList(new WxMall());