瀏覽代碼

Merge commit 'e5b2f4ac2d82b63a7683c4d01c9317fb74c8fc12' into release

release_toaliyun_real
luozukai 6 年之前
父節點
當前提交
bed371cdf7
共有 3 個檔案被更改,包括 14 行新增8 行删除
  1. +12
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml

+ 12
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java 查看文件

@@ -82,12 +82,15 @@ public class WxBusinessServiceImpl implements WxBusinessService {
List<WxRentContract> rentContractList = wxRentContractMapper.select(query); List<WxRentContract> rentContractList = wxRentContractMapper.select(query);
for (WxRentContract dbRent:rentContractList ) { for (WxRentContract dbRent:rentContractList ) {
if (StringUtils.isBlank(dbRent.getRentInfo()) || 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()); System.out.println("rent rentInfo is null:{}"+dbRent.getId());
continue; continue;
} }
logger.info("业态分析>>>>>>>>>>>>>>>>>>租金合同ID:" + dbRent.getId());
List<WxBillRent> previewBill = new ArrayList<>(); List<WxBillRent> previewBill = new ArrayList<>();
WxBillRent preview = new WxBillRent(); WxBillRent preview = new WxBillRent();
preview.setStarttime(dbRent.getRentalStartDate()); preview.setStarttime(dbRent.getRentalStartDate());
@@ -104,12 +107,15 @@ public class WxBusinessServiceImpl implements WxBusinessService {
List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.select(pquery); List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.select(pquery);
for (WxPropertyContract dbRent:propertyContractList) { for (WxPropertyContract dbRent:propertyContractList) {
if (StringUtils.isBlank(dbRent.getRentInfo()) || 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()); System.out.println("property rentInfo is null:{}"+dbRent.getId());
continue; continue;
} }
logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId());
List<WxBillProperty> previewBill = new ArrayList<>(); List<WxBillProperty> previewBill = new ArrayList<>();
WxBillProperty preview = new WxBillProperty(); WxBillProperty preview = new WxBillProperty();
preview.setStarttime(dbRent.getRentalStartDate()); preview.setStarttime(dbRent.getRentalStartDate());


+ 1
- 1
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.`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.`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.`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 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 left join wx_shop s on br.shop_id=s.id
<where> <where>


+ 1
- 1
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.`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.`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` 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 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 left join wx_shop s on br.shop_id=s.id
<where> <where>


Loading…
取消
儲存