From 5036b40e70aa1141deab6403c13493dba432a0d5 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 7 Aug 2024 02:16:20 +0800 Subject: [PATCH] fix --- .../iformall/controller/rent/WxAllBillController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 1f596a8b3..6558ccddf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -217,30 +217,39 @@ public class WxAllBillController extends BillBaseController { wxMerchant.setBillType(EnumBillAllType.RENT.getCode()); WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); + rentSum.setBillName(EnumBillAllType.RENT.getMessage()); wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + rentBussinessManageSum.setBillName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + rentOperationManageSum.setBillName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + rentDepositSum.setBillName(EnumBillAllType.RENT_DEPOSIT.getMessage()); wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode()); WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + propertySum.setBillName(EnumBillAllType.PROPERTY.getMessage()); wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + propertyDepositSum.setBillName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); wxMerchant.setBillType(EnumBillAllType.DAILY.getCode()); WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + dailySum.setBillName(EnumBillAllType.DAILY.getMessage()); wxMerchant.setBillType(EnumBillAllType.OTHER.getCode()); WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + otherSum.setBillName(EnumBillAllType.OTHER.getMessage()); wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); WxBillSum otherDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + otherDepositSum.setBillName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay()));