Skip to content

Y
yd-csf
Commit d8f146ba by jianan
Options

入账检核-手动新增

parent 3c2679f3
Showing with 13 additions and 15 deletions
yd-csf-service/src/main/java/com/yd/csf/service/component/CommissionAsyncService.java
...@@ -18,6 +18,7 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -18,6 +18,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -40,7 +41,7 @@ public class CommissionAsyncService { ...@@ -40,7 +41,7 @@ public class CommissionAsyncService {
private CommissionCompareRecordService commissionCompareRecordService; private CommissionCompareRecordService commissionCompareRecordService;
// @Async("commonAsyncExecutor") // @Async("commonAsyncExecutor")
@Transactional(rollbackFor = Exception.class) @Transactional(propagation = Propagation.REQUIRES_NEW)
public void commissionCompareBatch(List<Commission> entities) { public void commissionCompareBatch(List<Commission> entities) {
// 根据是否关联保单号，来区分比对方式 // 根据是否关联保单号，来区分比对方式
List<Commission> hasPolicyNoList = new ArrayList<>(); List<Commission> hasPolicyNoList = new ArrayList<>();
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -866,22 +866,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -866,22 +866,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commissionList.add(commission); commissionList.add(commission);
} }
// 提交事务，保存数据 // 提交事务，保存数据
transactionTemplate.execute(status -> { saveOrUpdateBatch(commissionList);
saveOrUpdateBatch(commissionList);
return null;
});
// 开启新事务，比对数据 // 开启新事务，比对数据
transactionTemplate.execute(status -> { try {
try { commissionAsyncService.commissionCompareBatch(commissionList);
commissionAsyncService.commissionCompareBatch(commissionList); } catch (Exception e) {
} catch (Exception e) { // 比对失败不影响主事务，记录日志即可
// 比对失败不影响主事务，记录日志即可 e.printStackTrace();
e.printStackTrace(); log.error("批量新增, 比对操作执行失败, error: {}", e.getMessage());
log.error("批量新增, 比对操作执行失败, error: {}", e.getMessage()); }
}
return null;
});
return commissionList; return commissionList;
} }
...@@ -949,6 +943,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -949,6 +943,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
if (ObjectUtils.isEmpty(request.getAmount())) { if (ObjectUtils.isEmpty(request.getAmount())) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账金额不能为空"); throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账金额不能为空");
} }
if (ObjectUtils.isEmpty(request.getExchangeRate())) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空");
}
if ("R".equals(request.getCommissionBizType())) { if ("R".equals(request.getCommissionBizType())) {
// 校验保单号是否存在 // 校验保单号是否存在
if (ObjectUtils.isEmpty(request.getExchangeRate())) { if (ObjectUtils.isEmpty(request.getExchangeRate())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment