|
|
|
@@ -825,6 +825,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
wxBillDeposit.setRentContractId(wxRentContract.getId());
|
|
|
|
wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
|
|
|
|
wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode());
|
|
|
|
wxBillDeposit.setCanEdit(EnumYesOrNo.NO.getCode());
|
|
|
|
if (null != fees) {
|
|
|
|
wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName());
|
|
|
|
}
|
|
|
|
@@ -1302,7 +1303,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
wxBillRent.setStarttime(billTimeVo.getStartDate());
|
|
|
|
wxBillRent.setEndtime(billTimeVo.getEndDate());
|
|
|
|
wxBillRent.setReceiveDate(billTimeVo.getReceiveDate());
|
|
|
|
|
|
|
|
wxBillRent.setCanEdit(EnumYesOrNo.NO.getCode());; |
|
|
|
//wxBillRent.setContractNeedPay(needpay);
|
|
|
|
//wxBillRent.setRentPriceInfo(getRentPriceInfo(wxRentContract,new BigDecimal(needpay)));
|
|
|
|
wxBillRent.setNeedPay(needpay);
|
|
|
|
@@ -1389,6 +1390,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
manage.setRentShopType(wxBillRent.getRentShopType());
|
|
|
|
manage.setRentArea(wxBillRent.getRentArea());
|
|
|
|
manage.setShopNumber(wxBillRent.getShopNumber());
|
|
|
|
manage.setCanEdit(EnumYesOrNo.NO.getCode());
|
|
|
|
if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){
|
|
|
|
manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId());
|
|
|
|
manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode());
|
|
|
|
@@ -2749,6 +2751,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
bmbill.setEnergyFeesId(type.getEnergyFeesId());
|
|
|
|
bmbill.setRentContractId(rentcontract.getId());
|
|
|
|
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setMerchantId(rentcontract.getMerchantId());
|
|
|
|
bmbill.setRentShopType(rentcontract.getRentShopType());
|
|
|
|
bmbill.setCreatetime(new Date());
|
|
|
|
@@ -2795,6 +2798,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
bmbill.setRentContractId(rentcontract.getId());
|
|
|
|
bmbill.setPropertyContractId(propertyContractId);
|
|
|
|
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setMerchantId(rentcontract.getMerchantId());
|
|
|
|
bmbill.setRentShopType(rentcontract.getRentShopType());
|
|
|
|
bmbill.setCreatetime(new Date());
|
|
|
|
@@ -2825,6 +2829,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
bmbill.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId());
|
|
|
|
bmbill.setRentContractId(rentcontract.getId());
|
|
|
|
bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
|
|
|
|
bmbill.setMerchantId(rentcontract.getMerchantId());
|
|
|
|
bmbill.setRentShopType(rentcontract.getRentShopType());
|
|
|
|
bmbill.setCreatetime(new Date());
|
|
|
|
|