入账检核-手动新增

yd-csf-service/src/main/java/com/yd/csf/service/component/CommissionAsyncService.java

@@ -18,6 +18,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -40,7 +41,7 @@ public class CommissionAsyncService {
     private CommissionCompareRecordService commissionCompareRecordService;
 
     //    @Async("commonAsyncExecutor")
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void commissionCompareBatch(List<Commission> entities) {
         // 根据是否关联保单号，来区分比对方式
         List<Commission> hasPolicyNoList = new ArrayList<>();

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

@@ -866,13 +866,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             commissionList.add(commission);
         }
         // 提交事务，保存数据
-        transactionTemplate.execute(status -> {
         saveOrUpdateBatch(commissionList);
-            return null;
-        });
 
         // 开启新事务，比对数据
-        transactionTemplate.execute(status -> {
         try {
             commissionAsyncService.commissionCompareBatch(commissionList);
         } catch (Exception e) {
@@ -880,8 +876,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             e.printStackTrace();
             log.error("批量新增, 比对操作执行失败, error: {}", e.getMessage());
         }
-            return null;
-        });
 
         return commissionList;
     }
@@ -949,6 +943,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if (ObjectUtils.isEmpty(request.getAmount())) {
                 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 (ObjectUtils.isEmpty(request.getExchangeRate())) {