| @@ -217,30 +217,39 @@ public class WxAllBillController extends BillBaseController { | |||||
| wxMerchant.setBillType(EnumBillAllType.RENT.getCode()); | wxMerchant.setBillType(EnumBillAllType.RENT.getCode()); | ||||
| WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); | WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); | ||||
| rentSum.setBillName(EnumBillAllType.RENT.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | ||||
| WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| rentBussinessManageSum.setBillName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); | wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); | ||||
| WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| rentOperationManageSum.setBillName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); | wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); | ||||
| WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| rentDepositSum.setBillName(EnumBillAllType.RENT_DEPOSIT.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode()); | wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode()); | ||||
| WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| propertySum.setBillName(EnumBillAllType.PROPERTY.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); | wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); | ||||
| WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| propertyDepositSum.setBillName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.DAILY.getCode()); | wxMerchant.setBillType(EnumBillAllType.DAILY.getCode()); | ||||
| WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| dailySum.setBillName(EnumBillAllType.DAILY.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.OTHER.getCode()); | wxMerchant.setBillType(EnumBillAllType.OTHER.getCode()); | ||||
| WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | ||||
| otherSum.setBillName(EnumBillAllType.OTHER.getMessage()); | |||||
| wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); | wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); | ||||
| WxBillSum otherDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime); | 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(), | vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), | ||||
| propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); | propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); | ||||