|
|
|
@@ -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())); |
|
|
|
|