| @@ -259,9 +259,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDaily.setPayDate(date); | wxBillDaily.setPayDate(date); | ||||
| } | } | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, date); | int expiredDay = DateUtils.daysBetween(receiveDate, date); | ||||
| wxBillDaily.setExpiredDay((long) expiredDay); | |||||
| wxBillDaily.setExpiredDay(billDaily.getExpiredDay()); | |||||
| if (expiredDay > 0) { | if (expiredDay > 0) { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | ||||
| if (billDaily.getExpiredDay().equals(0L)) { | |||||
| wxBillDaily.setExpiredDay((long) expiredDay); | |||||
| } | |||||
| } else { | } else { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | ||||
| } | } | ||||
| @@ -272,6 +275,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDaily.setUserId(user.getId()); | wxBillDaily.setUserId(user.getId()); | ||||
| wxBillDaily.setShopId(billDaily.getShopId()); | wxBillDaily.setShopId(billDaily.getShopId()); | ||||
| wxBillDaily.setRentShopType(billDaily.getRentShopType()); | wxBillDaily.setRentShopType(billDaily.getRentShopType()); | ||||
| wxBillDaily.setPayWay(EnumBillPayWay.OTHER.getCode()); | wxBillDaily.setPayWay(EnumBillPayWay.OTHER.getCode()); | ||||
| wxBillDaily.setCreatetime(date); | wxBillDaily.setCreatetime(date); | ||||
| wxBillDaily.setUpdatetime(date); | wxBillDaily.setUpdatetime(date); | ||||