| @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxBillProperty; | |||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.base.BaseEntity.SortField; | |||||
| import com.iformall.enums.EnumContractOperationType; | import com.iformall.enums.EnumContractOperationType; | ||||
| import com.iformall.enums.EnumContractType; | import com.iformall.enums.EnumContractType; | ||||
| import com.iformall.enums.EnumFlowContractType; | import com.iformall.enums.EnumFlowContractType; | ||||
| @@ -70,6 +71,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| } | } | ||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | wxPropertyContract.updateTenantInfo(getTenantInfo()); | ||||
| Map<String, Object> result = new HashMap<>(); | Map<String, Object> result = new HashMap<>(); | ||||
| wxPropertyContract.setSortColumns(SortField.Createtime_DESC); | |||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| if (null != pageInfo && null != pageInfo.getList()) { | if (null != pageInfo && null != pageInfo.getList()) { | ||||
| @@ -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`)) | 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 ; | 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 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; | ALTER TABLE wx_rent_contract DROP COLUMN shop_id; | ||||
| @@ -48,7 +48,7 @@ public class CouponOrderExpiringSchedule { | |||||
| @Autowired | @Autowired | ||||
| private WxOrderService wxOrderService; | private WxOrderService wxOrderService; | ||||
| @Scheduled(cron = "0 0/5 * * * ?") // 每天凌晨00:05 | |||||
| @Scheduled(cron = "0 0 5 * * ?") // 每天凌晨00:05 | |||||
| // @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | // @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | ||||
| public void couponOrderExpiringSchedule() { | public void couponOrderExpiringSchedule() { | ||||
| @@ -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秒中一次 | //@Scheduled(cron = "0 0 1 * * ?") // 测试10秒中一次 | ||||
| public void daliyAmountSchedule() { | public void daliyAmountSchedule() { | ||||
| List<WxMall> mallList = wxMallMapper.findList(new WxMall()); | List<WxMall> mallList = wxMallMapper.findList(new WxMall()); | ||||