Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
dc4dc33646
1 changed files with 54 additions and 49 deletions
  1. +54
    -49
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 54
- 49
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -2817,30 +2817,33 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setUpdatetime(new Date()); bmbill.setUpdatetime(new Date());
wxAllBillMapper.updateById(bmbill); wxAllBillMapper.updateById(bmbill);
}else { }else {
bmbill = new WxAllBill();
final IdWorker idWorker = IdWorker.get();
bmbill.setId(idWorker.nextId());
bmbill.updateTenantInfo(rentcontract);
bmbill.setBillType(type.getCode());
bmbill.setEnergyFeesId(type.getEnergyFeesId());
bmbill.setRentContractId(rentcontract.getId());
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
bmbill.setNeedPay(bussinessmoney);
bmbill.setReceivePay(bussinessmoney);
bmbill.setPay("0");
bmbill.setStarttime(rentBill.getStarttime());
bmbill.setEndtime(rentBill.getEndtime());
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
if (new BigDecimal(bussinessmoney).compareTo(new BigDecimal(0)) > 0 ) {
bmbill = new WxAllBill();
final IdWorker idWorker = IdWorker.get();
bmbill.setId(idWorker.nextId());
bmbill.updateTenantInfo(rentcontract);
bmbill.setBillType(type.getCode());
bmbill.setEnergyFeesId(type.getEnergyFeesId());
bmbill.setRentContractId(rentcontract.getId());
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
bmbill.setNeedPay(bussinessmoney);
bmbill.setReceivePay(bussinessmoney);
bmbill.setPay("0");
bmbill.setStarttime(rentBill.getStarttime());
bmbill.setEndtime(rentBill.getEndtime());
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
}else {
return null;
}
} }
return bmbill; return bmbill;
} }
@@ -2860,30 +2863,33 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxAllBillMapper.updateById(propertyBill); wxAllBillMapper.updateById(propertyBill);
return propertyBill; return propertyBill;
}else { }else {
WxAllBill bmbill = new WxAllBill();
final IdWorker idWorker = IdWorker.get();
bmbill.setId(idWorker.nextId());
bmbill.updateTenantInfo(rentcontract);
bmbill.setBillType(EnumBillAllType.PROPERTY.getCode());
bmbill.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
bmbill.setPropertyContractId(propertyContractId);
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
bmbill.setNeedPay(bussinessmoney);
bmbill.setReceivePay(bussinessmoney);
bmbill.setPay("0");
bmbill.setStarttime(rentBill.getStarttime());
bmbill.setEndtime(rentBill.getEndtime());
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
return bmbill;
if (new BigDecimal(bussinessmoney).compareTo(new BigDecimal(0)) > 0 ) {
WxAllBill bmbill = new WxAllBill();
final IdWorker idWorker = IdWorker.get();
bmbill.setId(idWorker.nextId());
bmbill.updateTenantInfo(rentcontract);
bmbill.setBillType(EnumBillAllType.PROPERTY.getCode());
bmbill.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
bmbill.setPropertyContractId(propertyContractId);
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date());
bmbill.setUpdatetime(new Date());
bmbill.setPriceDetail("");
bmbill.setNeedPay(bussinessmoney);
bmbill.setReceivePay(bussinessmoney);
bmbill.setPay("0");
bmbill.setStarttime(rentBill.getStarttime());
bmbill.setEndtime(rentBill.getEndtime());
bmbill.setStatus(EnumBillStatus.WAIT_PAY.getCode());
bmbill.setBillRemark(createFrom.getMessage()+",自动计算创建");
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,总计分摊比率为:"+rate+",应收金额为:"+bussinessmoney+"元,");
wxAllBillMapper.insert(bmbill);
return bmbill;
}
return null;
} }
} }
@@ -2912,7 +2918,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setExtraCreateFrom(createFrom.getCode()); bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,分摊比例为"+rate+",计算应收金额为:"+money+"元,"); bmbill.setMoneyChangeDetail("自动计算创建,分摊比例为"+rate+",计算应收金额为:"+money+"元,");
wxAllBillMapper.insert(bmbill); wxAllBillMapper.insert(bmbill);
return bmbill; return bmbill;
} }


Loading…
Cancel
Save