push

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionAddRequest.java

@@ -92,5 +92,10 @@ public class CommissionAddRequest implements Serializable {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String remark;
     private String remark;
 
 
+    /**
+     * 人工备注
+     */
+    private String manualRemark;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 }
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionUpdateRequest.java

@@ -103,5 +103,10 @@ public class CommissionUpdateRequest implements Serializable {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String remark;
     private String remark;
 
 
+    /**
+     * 人工备注
+     */
+    private String manualRemark;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 }
 }

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

@@ -406,6 +406,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         if (!Objects.equals(commission.getPolicyNo(), commissionUpdateRequest.getPolicyNo())) {
         if (!Objects.equals(commission.getPolicyNo(), commissionUpdateRequest.getPolicyNo())) {
             throw new BusinessException("当前保单号不匹配");
             throw new BusinessException("当前保单号不匹配");
         }
         }
+        String remark = commission.getRemark();
         Policy policy = null;
         Policy policy = null;
         if (StringUtils.isNotBlank(commissionUpdateRequest.getPolicyNo())) {
         if (StringUtils.isNotBlank(commissionUpdateRequest.getPolicyNo())) {
             policy = policyService.lambdaQuery().eq(Policy::getPolicyNo, commission.getPolicyNo()).one();
             policy = policyService.lambdaQuery().eq(Policy::getPolicyNo, commission.getPolicyNo()).one();
@@ -433,6 +434,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         // 计算来佣金额（港币）
         // 计算来佣金额（港币）
         commission.setHkdAmount(calculateHKDAmount(requestAmount, commissionUpdateRequest.getCurrency()));
         commission.setHkdAmount(calculateHKDAmount(requestAmount, commissionUpdateRequest.getCurrency()));
 
 
+        commission.setManualRemark(commissionUpdateRequest.getManualRemark());
+        commission.setRemark(remark);
+
         // 获取当前登录用户
         // 获取当前登录用户
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         String loginUserId = currentLoginUser.getId().toString();
         String loginUserId = currentLoginUser.getId().toString();
@@ -450,7 +454,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         commission.setUpdaterId(loginUserId);
         commission.setUpdaterId(loginUserId);
         commission.setUpdateTime(new Date());
         commission.setUpdateTime(new Date());
         // 执行更新操作（这个方法将在当前事务中执行）
         // 执行更新操作（这个方法将在当前事务中执行）
-        commission.setManualRemark(commissionUpdateRequest.getRemark());
         this.updateById(commission);
         this.updateById(commission);
 
 
         // 2. 新事务，比对
         // 2. 新事务，比对
@@ -862,6 +865,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         for (CommissionAddRequest request : customerAddRequestList) {
         for (CommissionAddRequest request : customerAddRequestList) {
             Commission commission = new Commission();
             Commission commission = new Commission();
             BeanUtils.copyProperties(request, commission);
             BeanUtils.copyProperties(request, commission);
+            commission.setManualRemark(request.getManualRemark());
 
 
             // 入账年月
             // 入账年月
             commission.setCommissionDate(DateUtil.parse(request.getCommissionDate() + "-01"));
             commission.setCommissionDate(DateUtil.parse(request.getCommissionDate() + "-01"));