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