|
|
|
@@ -768,7 +768,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
|
|
|
|
++billcount; |
|
|
|
//物业主账单 |
|
|
|
WxAllBill wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null); |
|
|
|
WxAllBill wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null,false); |
|
|
|
//设置物业科目 |
|
|
|
wxBillProperty.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId()); |
|
|
|
//非一次性账单 |
|
|
|
@@ -818,11 +818,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
private WxAllBill generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,MallUserInfo user,WxBillFeesStandardsListVo svo, |
|
|
|
Integer billcount,Map<String, Object> shopInfo) { |
|
|
|
Long feesStandardsId = svo.getFeeStandards().getId(); |
|
|
|
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),user,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId); |
|
|
|
boolean isDeposit = svo.isDeposit(); |
|
|
|
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),user,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId,isDeposit); |
|
|
|
} |
|
|
|
|
|
|
|
private WxAllBill generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, |
|
|
|
MallUserInfo user,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId) { |
|
|
|
MallUserInfo user,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId,boolean isDeposit) { |
|
|
|
if (StringUtils.isBlank(needpay)) { |
|
|
|
needpay = "0"; |
|
|
|
}else { |
|
|
|
@@ -832,7 +833,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
WxAllBill wxBillProperty = new WxAllBill(); |
|
|
|
wxBillProperty.setIsPreview(isPreview); |
|
|
|
wxBillProperty.setId(idWorker.nextId()); |
|
|
|
wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode()); |
|
|
|
if (isDeposit) { |
|
|
|
wxBillProperty.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); |
|
|
|
}else { |
|
|
|
wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode()); |
|
|
|
} |
|
|
|
wxBillProperty.setPropertyContractId(wxPropertyContract.getId()); |
|
|
|
wxBillProperty.setPay("0"); |
|
|
|
wxBillProperty.setStarttime(start); |
|
|
|
|