|
|
|
@@ -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<WxBillSum> 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); |
|
|
|
} |
|
|
|
|
|
|
|
|