From 4d7b9e23e8138c4aa0ad00a9e9be9eb0407e0eca Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 1 Aug 2019 15:54:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=87=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A7=9F=E9=87=91=E5=8F=8A=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 3 +++ .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 81474ccba..dfcdf1551 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -268,6 +268,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { for (Map.Entry> entry : entries) { List list = entry.getValue(); for (WxBillProperty property : list) { + if (property.getDepositStatus() == null) { + property.setDepositStatus(0); + } String shopNumber = property.getShopNumber(); if (StringUtils.isEmpty(shopNumber)) { String shopInfo = property.getShopInfo(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 882ce8b44..10669c5de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -317,6 +317,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { for (Map.Entry> entry : entries) { List list = entry.getValue(); for (WxBillRent rent : list) { + if (rent.getDepositStatus() == null) { + rent.setDepositStatus(0); + } String shopNumber = rent.getShopNumber(); if (StringUtils.isEmpty(shopNumber)) { String shopInfo = rent.getShopInfo(); From 10bb9806402cf0d8d7690ffba4dc1d9bd77f10d9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 1 Aug 2019 16:26:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=85=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=97=A5=E5=B8=B8=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 564e0f634..017efac28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1050,7 +1050,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { } daily.setReceivePay(receivePay); daily.setPay(daily.getPay() + pay); - daily.setPay(daily.getPay() + pay); daily.setOwe(0L); long owe = daily.getReceivePay() - daily.getPay(); if (owe > 0) { From 0aa8c5b40f63b87e8500b48f6d42a4940f426c5e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 1 Aug 2019 17:11:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E9=80=BE=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index a713cd442..15802a180 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -46,7 +46,7 @@ bill.receive_pay receivePay,bill.pay, case when bill.status=1 then bill.owe else 0 end owe ,bill.receive_date receiveDate, - bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status,bill.starttime, + bill.pay_date payDate,expired_day expiredDay,bill.status,bill.starttime, bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName, s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments from (