|
|
|
@@ -255,7 +255,29 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
logger.error("启动审批流失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
return resultData; |
|
|
|
WxRentContract wxRentContract = (WxRentContract)resultData.data; |
|
|
|
|
|
|
|
//删除预账单 |
|
|
|
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getRentalStartDate()!=null && record.getPrice()!= null){ |
|
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
buildRent(wxMerchant,null); |
|
|
|
int receivePeriod = record.getReceivePeriod().intValue(); |
|
|
|
Integer lease = record.getLease(); |
|
|
|
Date rentalStartDate = record.getRentalStartDate(); |
|
|
|
Integer price = record.getPrice(); |
|
|
|
//按月计租 |
|
|
|
List<WxBillRent> resultList; |
|
|
|
if (record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())) { |
|
|
|
resultList = buildRentMonth(wxMerchant, userId, record, receivePeriod, lease, rentalStartDate, price,EnumIsPreview.YES.getCode()); |
|
|
|
} else { |
|
|
|
//按日计租 |
|
|
|
resultList = buildRent(lease, receivePeriod, price, rentalStartDate, Calendar.DAY_OF_MONTH, record, userId, wxMerchant, 0,EnumIsPreview.YES.getCode()); |
|
|
|
} |
|
|
|
wxRentContract.setPreviewBillRentList(resultList); |
|
|
|
} |
|
|
|
return new ResultData(wxRentContract); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultData getResultDataForUpdate(WxRentContract record, Long userId) { |
|
|
|
@@ -312,25 +334,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
logger.error("更新租赁合同信息失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
//删除预账单 |
|
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
buildRent(wxMerchant,null); |
|
|
|
int receivePeriod = record.getReceivePeriod().intValue(); |
|
|
|
Integer lease = record.getLease(); |
|
|
|
Date rentalStartDate = record.getRentalStartDate(); |
|
|
|
Integer price = record.getPrice(); |
|
|
|
//按月计租 |
|
|
|
List<WxBillRent> resultList; |
|
|
|
if (record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())) { |
|
|
|
resultList = buildRentMonth(wxMerchant, userId, record, receivePeriod, lease, rentalStartDate, price,EnumIsPreview.YES.getCode()); |
|
|
|
} else { |
|
|
|
//按日计租 |
|
|
|
resultList = buildRent(lease, receivePeriod, price, rentalStartDate, Calendar.DAY_OF_MONTH, record, userId, wxMerchant, 0,EnumIsPreview.YES.getCode()); |
|
|
|
} |
|
|
|
wxRentContract.setPreviewBillRentList(resultList); |
|
|
|
return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -888,6 +891,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
wxRentContractMapper.updateStatus(updateRentContract); |
|
|
|
logger.info("id:{},启动审批流成功,是否补录:{}",record.getId().toString(),record.getMerchantId() != null); |
|
|
|
} |
|
|
|
|
|
|
|
// 保存调整金额(预账单调整) |
|
|
|
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ |
|
|
|
for (WxBillRent wxBillRent:record.getPreviewBillRentList()) { |
|
|
|
wxBillRentMapper.update(wxBillRent); |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("启动审批流失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage()); |
|
|
|
|