|
|
|
@@ -219,61 +219,34 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
} |
|
|
|
//根据科目来 |
|
|
|
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxMerchant,starttime, enttime); |
|
|
|
if (null == sumList ) { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
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())); |
|
|
|
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); |
|
|
|
WxEnergyFees fq = new WxEnergyFees(); |
|
|
|
fq.updateTenantInfo(wxMerchant); |
|
|
|
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq); |
|
|
|
BigDecimal needpay = new BigDecimal(0); |
|
|
|
BigDecimal paid = new BigDecimal(0); |
|
|
|
BigDecimal owe = new BigDecimal(0); |
|
|
|
for (int i = 0 ; i < sumList.size() ; i ++) { |
|
|
|
WxBillSum s = sumList.get(i); |
|
|
|
if (null != s.getEnergyFeesId() && null != feesMap) { |
|
|
|
WxEnergyFees fees = feesMap.get(s.getEnergyFeesId()); |
|
|
|
if (null != fees) { |
|
|
|
s.setBillName(fees.getName()); |
|
|
|
} |
|
|
|
needpay = needpay.add(s.getNeedPayNumber()); |
|
|
|
paid = paid.add(s.getPaidNumber()); |
|
|
|
owe = owe.add(s.getOweNumber()); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setNeedPay(needpay.toPlainString()); |
|
|
|
vo.setPaid(paid.toPlainString()); |
|
|
|
vo.setOwe(owe.toPlainString()); |
|
|
|
vo.setBillSumList(sumList); |
|
|
|
|
|
|
|
return new ResultData(vo); |
|
|
|
} |
|
|
|
|