|
|
|
@@ -545,11 +545,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
//保存调整金额(预账单调整)
|
|
|
|
//if (saveBill) {
|
|
|
|
savePreviewBill(record,user);
|
|
|
|
// savePreviewBill(record,user);
|
|
|
|
//保存商业管理费账单
|
|
|
|
savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
|
|
|
|
// savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
|
|
|
|
//保存营业管理费账单
|
|
|
|
savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
|
|
|
|
// savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
|
|
|
|
//}
|
|
|
|
|
|
|
|
WxRentContract wxRentContract = (WxRentContract)resultData.data;
|
|
|
|
@@ -614,11 +614,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
deletePrewBill(record);
|
|
|
|
resultList = buildRent(user, rentContract, EnumIsPreview.YES.getCode(),true);
|
|
|
|
rentContract.setPreviewBillRentList(resultList);
|
|
|
|
savePreviewBill(rentContract,user);
|
|
|
|
//savePreviewBill(rentContract,user);
|
|
|
|
//保存商业管理费账单
|
|
|
|
savePreviewManageFeeBill(rentContract,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
|
|
|
|
//savePreviewManageFeeBill(rentContract,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
|
|
|
|
//保存营业管理费账单
|
|
|
|
savePreviewManageFeeBill(rentContract,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
|
|
|
|
//savePreviewManageFeeBill(rentContract,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
|
|
|
|
|
|
|
|
rentContract.setRentalStartDate(oldDate);
|
|
|
|
return new ResultData(rentContract);
|
|
|
|
@@ -1574,7 +1574,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
BigDecimal shoprentArea = shopAreaRateMap.get(sid);
|
|
|
|
BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxRentContract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
|
|
|
|
try {
|
|
|
|
logger.info(" mmmmmmmmmmmm >>> rentArea:"+rb.getRentArea()+";period"+rb.getPeriod()+";receiveDate:"+rb.getReceiveDate());
|
|
|
|
BeanUtils.copyProperties(rs, rb);
|
|
|
|
rs.setId(idWorker.nextId());
|
|
|
|
rs.setShopId(sid);
|
|
|
|
|