Browse Source

fix contract

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
cd5543a3e5
4 changed files with 12 additions and 3 deletions
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +8
    -1
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  3. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  4. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -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<String, Object> result = new HashMap<>();
wxPropertyContract.setSortColumns(SortField.Createtime_DESC);
PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize);
Integer hasFlow = null;
if (null != pageInfo && null != pageInfo.getList()) {


+ 8
- 1
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql View File

@@ -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;


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java View File

@@ -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() {



+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java View File

@@ -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<WxMall> mallList = wxMallMapper.findList(new WxMall());


Loading…
Cancel
Save