Просмотр исходного кода

[铜锣湾][修改][预账单]

release_toaliyun_real
luozukai 7 лет назад
committed by Stormeye Wu
Родитель
Сommit
6b123437f8
2 измененных файлов: 12 добавлений и 14 удалений
  1. +6
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +6
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 6
- 7
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);
}



+ 6
- 7
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;
}



Загрузка…
Отмена
Сохранить