diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 0d278761a..ea54174ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -144,6 +144,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { + // 保存调整金额(预账单调整) + if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ + for (WxBillProperty wxBillProperty:record.getPreviewBillRentList()) { + wxBillPropertyMapper.update(wxBillProperty); + } + } if (null == record.getShopId()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "shopId不能为空"); @@ -300,13 +306,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxPropertyContractMapper.updateStatus(updateRentContract); logger.info("id:{},启动审批流成功",record.getId().toString()); } - - // 保存调整金额(预账单调整) - if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ - for (WxBillProperty wxBillProperty:record.getPreviewBillRentList()) { - wxBillPropertyMapper.update(wxBillProperty); - } - } return new ResultData(Result.SUCCESS, message, record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 4386b7800..38b9c702b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -925,6 +925,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override @Transactional(rollbackFor = {Exception.class}) public ResultData updateFile(WxRentContract record, Long userId,String userName) { + // 保存调整金额(预账单调整) + if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ + for (WxBillRent wxBillRent:record.getPreviewBillRentList()) { + wxBillRentMapper.update(wxBillRent); + } + } ResultData resultData = getResultDataForUpdate(record, userId); // 启动审批流 if(record.getFlowParams() != null){ @@ -941,13 +947,6 @@ 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); - } - } return resultData; }