From 42ec11e23de95b4d66cfeeba20f8252f37e050df Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 16:32:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8E=92=E9=99=A4=E6=9C=AA=E8=AE=A1?= =?UTF-8?q?=E7=A7=9F=E7=9A=84=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBusinessServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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..2a762ac06 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -81,10 +81,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { query.setBusinessId((Integer) e.get("id")); 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())) { + 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())) { System.out.println("rent rentInfo is null:{}"+dbRent.getId()); continue; } @@ -103,10 +103,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { pquery.setBusinessId((Integer) e.get("id")); 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())) { + 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())) { System.out.println("property rentInfo is null:{}"+dbRent.getId()); continue; } From 43ebf03e6307c8b0f3f5be1d128c85df4b6527e9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 16:36:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8E=92=E9=99=A4=E6=9C=AA=E8=AE=A1?= =?UTF-8?q?=E7=A7=9F=E7=9A=84=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBusinessServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 2a762ac06..e82428a28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -81,10 +81,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { query.setBusinessId((Integer) e.get("id")); 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())) { + if (StringUtils.isBlank(dbRent.getRentInfo()) || + 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; } @@ -103,10 +105,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { pquery.setBusinessId((Integer) e.get("id")); 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())) { + if (StringUtils.isBlank(dbRent.getRentInfo()) || + 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; } From a004022ea04ec80bce8f3f62f2d526e804ff63b9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 16:44:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=93=E5=8D=B0=E5=90=88=E5=90=8CID?= =?UTF-8?q?=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBusinessServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 e82428a28..48a7f548f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -90,6 +90,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { 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()); @@ -114,6 +115,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { 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()); From e5b2f4ac2d82b63a7683c4d01c9317fb74c8fc12 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 10 Sep 2019 16:51:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=82=B9=E7=8E=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillDepositMapper.xml | 2 +- .../src/main/resources/mapper/WxBillPropertyDepositMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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