diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index be5b90051..48a7f548f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -82,12 +82,15 @@ public class WxBusinessServiceImpl implements WxBusinessService { List rentContractList = wxRentContractMapper.select(query); for (WxRentContract dbRent:rentContractList ) { if (StringUtils.isBlank(dbRent.getRentInfo()) || - dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || - dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || - dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { + dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { System.out.println("rent rentInfo is null:{}"+dbRent.getId()); continue; } + logger.info("业态分析>>>>>>>>>>>>>>>>>>租金合同ID:" + dbRent.getId()); List previewBill = new ArrayList<>(); WxBillRent preview = new WxBillRent(); preview.setStarttime(dbRent.getRentalStartDate()); @@ -104,12 +107,15 @@ public class WxBusinessServiceImpl implements WxBusinessService { List propertyContractList = wxPropertyContractMapper.select(pquery); for (WxPropertyContract dbRent:propertyContractList) { if (StringUtils.isBlank(dbRent.getRentInfo()) || - dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || - dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || - dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { + dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || + dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { System.out.println("property rentInfo is null:{}"+dbRent.getId()); continue; } + logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId()); List previewBill = new ArrayList<>(); WxBillProperty preview = new WxBillProperty(); preview.setStarttime(dbRent.getRentalStartDate()); diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index ab05f23ba..1d5bcc190 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -73,7 +73,7 @@ br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice, - br.pay_way payWay,br.shop_info shopInfo + br.pay_way payWay,br.shop_info shopInfo,br.freeze from wx_bill_rent_deposit br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 1c2df030c..573e3f2fe 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -73,7 +73,7 @@ br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice,br.`shop_info` - shopInfo,br.pay_way payWay,br.pay_way payWay + shopInfo,br.pay_way payWay,br.pay_way payWay,br.freeze from wx_bill_property_deposit br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id