From 9c8960dc26e3afb272dfe7b9b23b0f2d965f3726 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 7 Aug 2024 02:06:12 +0800 Subject: [PATCH] fix --- .../controller/rent/WxAllBillController.java | 47 +++++++++++++++++++ .../service/helper/WxBillAllHelper.java | 2 +- .../main/resources/mapper/WxAllBillMapper.xml | 2 +- 3 files changed, 49 insertions(+), 2 deletions(-) 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 78c41de60..1f596a8b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -214,6 +214,53 @@ public class WxAllBillController extends BillBaseController { if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); } + + wxMerchant.setBillType(EnumBillAllType.RENT.getCode()); + WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); + WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); + WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); + WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode()); + WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); + WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.DAILY.getCode()); + WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.OTHER.getCode()); + WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); + WxBillSum otherDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); + + vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), + propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); + vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(), + propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid())); + vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), + propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); + + List sumlist = new ArrayList<>(); + sumlist.add(rentSum); + sumlist.add(rentBussinessManageSum); + sumlist.add(rentOperationManageSum); + sumlist.add(rentDepositSum); + sumlist.add(propertySum); + sumlist.add(propertyDepositSum); + sumlist.add(dailySum); + sumlist.add(otherSum); + sumlist.add(otherDepositSum); + vo.setBillSumList(sumlist); + return new ResultData(vo); } 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 0dad960a4..69962ef71 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -118,7 +118,7 @@ public class WxBillAllHelper { return wxAllBillService.getBillHotNotify(br); } - private String calcuteSum(String... money) { + public String calcuteSum(String... money) { if (null != money) { BigDecimal total = new BigDecimal(0); for (int i = 0 ; i < money.length ; i++) { diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index c694051ba..7a91c57b7 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -182,7 +182,7 @@ bill_type, count(1) total_count , sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)) + CAST(IFNULL(`return_pay`,'0') AS DECIMAL(20,2))) total_money, - MIN(br.starttime) min_begin_time from wx_all_bill + MIN(starttime) min_begin_time from wx_all_bill group by bill_type