前端对接问题修复13

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -30,6 +30,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -372,6 +373,50 @@ public class ApiCommissionController {
     }
 
     /**
+     * 修改比对状态
+     *
+     * @param updateCompareStatusRequest
+     * @return
+     */
+    @PostMapping("/updateCompareStatus")
+    @Operation(summary = "修改比对状态")
+    public Result<Boolean> updateCompareStatus(@RequestBody UpdateCompareStatusRequest updateCompareStatusRequest) {
+        if (updateCompareStatusRequest == null) {
+            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
+        }
+        String commissionBizId = updateCompareStatusRequest.getCommissionBizId();
+        if (StringUtils.isBlank(commissionBizId)) {
+            log.error("来佣业务id不能为空：{}", commissionBizId);
+            return Result.fail(ResultCode.NULL_ERROR.getCode(), "来佣业务id不能为空");
+        }
+        String status = updateCompareStatusRequest.getStatus();
+        if (StringUtils.isBlank(status)) {
+            log.error("来佣比对状态不能为空：{}", status);
+            return Result.fail(ResultCode.NULL_ERROR.getCode(), "来佣比对状态不能为空");
+        }
+
+        // 查询旧数据
+        Commission commission = commissionService.getByCommissionBizId(commissionBizId);
+        if (commission == null) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "未找到该来佣记录");
+        }
+
+        // 获取当前登录用户
+        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
+        String loginUserId = currentLoginUser.getId().toString();
+
+        // 更新属性
+        commission.setStatus(status);
+        commission.setStatusDesc(updateCompareStatusRequest.getStatusDesc());
+        commission.setUpdaterId(loginUserId);
+        commission.setUpdateTime(new Date());
+        // 执行更新
+        commissionService.updateById(commission);
+
+        return Result.success(true);
+    }
+
+    /**
      * 来佣操作记录列表
      *
      * @param queryRequest

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

@@ -49,8 +49,8 @@ public class CommissionUpdateRequest implements Serializable {
     /**
      * 来佣比对状态
      */
-    @Schema(description = "来佣比对状态 1=比对成功 2=比对失败")
-    private String status;
+//    @Schema(description = "来佣比对状态 1=比对成功 2=比对失败")
+//    private String status;
 
     /**
      * 佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)

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

+package com.yd.csf.service.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 修改比对状态请求参数
+ */
+@Data
+public class UpdateCompareStatusRequest {
+    /**
+     * 来佣业务id
+     */
+    @Schema(description = "来佣业务id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String commissionBizId;
+    /**
+     * 来佣比对状态 1=比对成功 2=比对失败
+     */
+    @Schema(description = "来佣比对状态 1=比对成功 2=比对失败", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String status;
+
+    /**
+     * 比对状态-修改理由
+     */
+    @Schema(description = "比对状态-修改理由")
+    private String statusDesc;
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java

@@ -138,6 +138,11 @@ public class Commission implements Serializable {
     private String status;
 
     /**
+     * 来佣比对状态-修改理由
+     */
+    private String statusDesc;
+
+    /**
      * 预计来佣业务id
      */
     private String commissionExpectedBizId;

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

@@ -412,7 +412,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                         commissionExpected.setCommissionPeriod(Convert.toInt(item.getIssueNumber()));
                         commissionExpected.setTotalPeriod(Convert.toInt(item.getEndPeriod()));
                         commissionExpected.setCommissionName(item.getExpenseName());
-                        commissionExpected.setCommissionType("");
+                        commissionExpected.setCommissionType(item.getExpenseName());
                         commissionExpected.setCommissionRatio(item.getCommissionRate());
                         commissionExpected.setAmount(null);
                         commissionExpected.setCurrency(item.getCurrency());

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

@@ -249,10 +249,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
         }
-        if (!Objects.equals(commission.getStatus(), commissionUpdateRequest.getStatus())) {
-            CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣比对状态", commission.getStatus(), commissionUpdateRequest.getStatus(), commission.getCommissionBizId(), currentLoginUser);
-            commissionEditRecords.add(commissionRecord);
-        }
         if (!Objects.equals(commission.getRemark(), commissionUpdateRequest.getRemark())) {
             CommissionEditRecord commissionRecord = getCommissionEditRecord("备注", commission.getRemark(), commissionUpdateRequest.getRemark(), commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);

yd-csf-service/src/main/resources/mappers/CommissionMapper.xml

@@ -29,6 +29,7 @@
             <result property="periodPaidRatio" column="period_paid_ratio" />
             <result property="periodPendingRatio" column="period_pending_ratio" />
             <result property="status" column="status" />
+            <result property="statusDesc" column="status_desc" />
             <result property="remark" column="remark" />
             <result property="isDeleted" column="is_deleted" />
             <result property="creatorId" column="creator_id" />
@@ -42,7 +43,8 @@
         insurance_company_biz_id,product_launch_biz_id,
         reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
         total_period,commission_name,commission_type,exchange_rate,amount,currency,
-        commission_date,current_commission_ratio,period_paid_ratio,period_pending_ratio,status,remark,is_deleted,creator_id,
+        commission_date,current_commission_ratio,period_paid_ratio,period_pending_ratio,
+        status,status_desc,remark,is_deleted,creator_id,
         updater_id,create_time,update_time
     </sql>