From 599411d8298d7739389f57e4ebe74f6bdab1a067 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 6 Aug 2024 10:55:56 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/helper/WxRentContractHelper.java | 2 ++ .../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index d84b7353f..c08079436 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -483,10 +483,12 @@ public class WxRentContractHelper { //不是一个月的。但是按整月算的 int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01"); for (int i = 0 ; i < months; i++) { + //当前时间到当前月底 Date currentMonthEnd = DateUtils.getLastDayForMonth(start); NeedPayDTO np = getMonthPay(start, currentMonthEnd, price, decimalSize, validDays, dayPriceCalcute, monthAvageDays); start = DateUtils.getDaySet(currentMonthEnd,Calendar.DATE,1); total = total.add(np.getMoney()); + //TODO 这个月底到下个月 } return total.toPlainString(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 37b90440a..446a4286c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1018,6 +1018,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.setUpdateTime(date); record.setUpdateBy(user.getId()); record.setUpdateByName(user.getName()); + record.setStatus(EnumFinanceFinishStatus.READY.getCode()); try { wxFinanceFinishMapper.insert(record); } catch (Exception e) {