From bfc165cc4947dbdc27f1aea5f8b9414e3174db47 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 17 Dec 2024 12:57:55 +0800 Subject: [PATCH] fix --- .../controller/contract/WxRentContractController.java | 4 ++++ .../java/com/iformall/service/helper/WxBillAllHelper.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 32acf063f..52dd5c39b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -743,8 +743,12 @@ public class WxRentContractController extends WxContractBaseController { if (null != s) { bill.setSales(s.getSaleMoney()); bill.setSalesTime(s.getUpdateTime()); + //已锁定的不能再设置 if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) { // + //TODO 年度已经汇算的不能再设置 + //}else if() { + }else { validBillList.add(bill); } 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 df1341725..9dbbad1c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -204,7 +204,7 @@ public class WxBillAllHelper { bq.setIsPreview(EnumYesOrNo.NO.getCode()); bq.setBillType(EnumBillAllType.RENT.getCode()); bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); - bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); + //bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); bq.setStarttimeEqual(starttime); bq.setEndtimeEqual(endtime); return bq; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 24562ee3f..1d9a5a3e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2589,6 +2589,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { billDel.setStarttimeEqual(startime); wxAllBillMapper.deleteByRentReveneuSales(billDel); + //上面删除掉生成的账单之后,再重新查询,只剩下主账单 + rentBillList = wxAllBillMapper.findList(bq); + //加上物业 List propertyBillList = null; BigDecimal propertyPrice = new BigDecimal(0);