|
|
|
@@ -946,29 +946,32 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId);
|
|
|
|
if (wxRentContract != null && StringUtils.isNotBlank(wxRentContract.getDeposit())
|
|
|
|
&& new BigDecimal(wxRentContract.getDeposit()).compareTo(new BigDecimal(0)) > 0 ) {
|
|
|
|
//根据不同的科目生成不同的押金账单
|
|
|
|
Map<Long,String> feesMap = wxRentContract.getDepositEnergyFees();
|
|
|
|
|
|
|
|
|
|
|
|
WxEnergyFees fq = new WxEnergyFees();
|
|
|
|
fq.updateTenantInfo(tenantEntity);
|
|
|
|
fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
|
|
|
|
Map<Long,WxEnergyFees> typeMap = wxEnergyService.getFeesMap(fq);
|
|
|
|
|
|
|
|
//根据不同的科目生成不同的押金账单
|
|
|
|
Map<Long,WxEnergyFees> feesMap = wxRentContract.getDepositEnergyFees(typeMap);
|
|
|
|
|
|
|
|
List<WxBillDeposit> insertList = new ArrayList<WxBillDeposit>();
|
|
|
|
|
|
|
|
for (Iterator<Long> it = feesMap.keySet().iterator();it.hasNext();){
|
|
|
|
Long energyFeesId = it.next();
|
|
|
|
String deposit = feesMap.get(energyFeesId);
|
|
|
|
WxEnergyFees depositFee = feesMap.get(energyFeesId);
|
|
|
|
WxEnergyFees fees = typeMap.get(energyFeesId);
|
|
|
|
final IdWorker idWorker = IdWorker.get();
|
|
|
|
WxBillDeposit wxBillDeposit = new WxBillDeposit();
|
|
|
|
wxBillDeposit.setId(idWorker.nextId());
|
|
|
|
wxBillDeposit.setRentContractId(wxRentContract.getId());
|
|
|
|
if (null != fees) {
|
|
|
|
wxBillDeposit.setContractDepoistDetail("合同押金项["+fees.getName()+"]"+deposit+"元");
|
|
|
|
wxBillDeposit.setContractDepoistDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName());
|
|
|
|
}
|
|
|
|
wxBillDeposit.setPay("0");
|
|
|
|
//String needpay = wxRentContract.getDeposit();
|
|
|
|
String needpay = deposit;
|
|
|
|
String needpay = depositFee.calcuteTotalMoney(wxRentContract.getDecimalSize(), null, null, "1", true, null, null);
|
|
|
|
wxBillDeposit.setReceivePay(needpay);
|
|
|
|
wxBillDeposit.setNeedPay(needpay);
|
|
|
|
//wxBillDeposit.setOwe(needpay);
|
|
|
|
|