From 49f3e0a498e12c88d82ee808fc12177c6b8af626 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 27 Aug 2024 17:41:57 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/helper/WxBillAllHelper.java | 6 +++++- .../com/iformall/service/impl/WxAllBillServiceImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 429f17b22..54403b316 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -360,12 +360,16 @@ public class WxBillAllHelper { * 那是之前的账单,不处理。 * @param merchant */ - public boolean billEndCalcute(Integer decimalSize,Date endTime,WxAllBill bill,WxBillAction action, boolean isAllReturn) { + public boolean billEndCalcute(Integer decimalSize,Date endTime,WxAllBill bill,WxBillAction action) { String endTimeStr = DateUtils.date2String(endTime,DateUtils.DATE_TIME_PATTERN); boolean isUpdate = false; action.setBillId(bill.getId()); action.setBillType(bill.getBillType()); String oldReceivePay = bill.getReceivePay(); + boolean isAllReturn = false; + if (EnumBillAllType.getEnum(bill.getBillType()).isDeposit()) { + isAllReturn = true; + } //如果账单的开始时间在结束时间之后,已经支付了的要退回。 if (!bill.getStarttime().before(endTime)) { bill.setReceivePay("0"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 20742eccd..dad00c91e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -562,7 +562,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill for (int i = 0 ; i < brList.size() ; i ++ ) { WxAllBill brent = brList.get(i); WxBillAction action = new WxBillAction(); - boolean isUpdate = wxBillAllHelper.billEndCalcute(rentContract.getDecimalSize(),rentContract.getEndContractTime(), brent, action, false); + boolean isUpdate = wxBillAllHelper.billEndCalcute(rentContract.getDecimalSize(),rentContract.getEndContractTime(), brent, action); if (isUpdate) { realRentList.add(brent); actionList.add(action); @@ -603,7 +603,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill for (int i = 0 ; i < brList.size() ; i ++ ) { WxAllBill brent = brList.get(i); WxBillAction action = new WxBillAction(); - boolean isUpdate = wxBillAllHelper.billEndCalcute(propertyContract.getDecimalSize() ,propertyContract.getEndContractTime(), brent, action, false); + boolean isUpdate = wxBillAllHelper.billEndCalcute(propertyContract.getDecimalSize() ,propertyContract.getEndContractTime(), brent, action); if (isUpdate) { realRentList.add(brent); actionList.add(action); @@ -642,7 +642,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill for (int i = 0 ; i < brList.size() ; i ++ ) { WxAllBill brent = brList.get(i); WxBillAction action = new WxBillAction(); - boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action, false); + boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action); if (isUpdate) { realRentList.add(brent); actionList.add(action);