push

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

@@ -147,6 +147,11 @@ public class Commission implements Serializable {
     private String commissionExpectedBizId;
     private String commissionExpectedBizId;
 
 
     /**
     /**
+     * 人工备注
+     */
+    private String manualRemark;
+
+    /**
      * 通用备注
      * 通用备注
      */
      */
     private String remark;
     private String remark;

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

@@ -161,6 +161,11 @@ public class CommissionExpected implements Serializable {
     private BigDecimal pendingRatio;
     private BigDecimal pendingRatio;
 
 
     /**
     /**
+     * 人工备注
+     */
+    private String manualRemark;
+
+    /**
      * 通用备注
      * 通用备注
      */
      */
     private String remark;
     private String remark;

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

@@ -255,7 +255,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setCommissionDate(null);
         vo.setCommissionDate(null);
         //本次入账比例
         //本次入账比例
         vo.setRevenueRatio(null);
         vo.setRevenueRatio(null);
-        vo.setRealRemark(expected.getRemark());
+        vo.setRemark(expected.getRemark());
+        vo.setManualRemark(expected.getManualRemark());
+        vo.setStatusDesc(expected.getStatusDesc());
         vo.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
         vo.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
         vo.setCommissionExpectedDate(expected.getCommissionDate());
         vo.setCommissionExpectedDate(expected.getCommissionDate());
         vo.setCurrency(expected.getCurrency());
         vo.setCurrency(expected.getCurrency());
@@ -362,10 +364,11 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setRealCurrentCommissionRatio(commission.getCurrentCommissionRatio());
         vo.setRealCurrentCommissionRatio(commission.getCurrentCommissionRatio());
         vo.setRealUpdateTime(commission.getUpdateTime());
         vo.setRealUpdateTime(commission.getUpdateTime());
         vo.setRealUpdaterName(commission.getUpdaterName());
         vo.setRealUpdaterName(commission.getUpdaterName());
-        vo.setRealRemark(commission.getRemark());
         vo.setCommissionDate(commission.getCommissionDate());
         vo.setCommissionDate(commission.getCommissionDate());
-        vo.setRealRemark(commission.getRemark());
         vo.setCommissionBizId(commission.getCommissionBizId());
         vo.setCommissionBizId(commission.getCommissionBizId());
+        vo.setRemark(commission.getRemark());
+        vo.setManualRemark(commission.getManualRemark());
+        vo.setStatusDesc(commission.getStatusDesc());
 
 
         // 覆盖公共业务字段
         // 覆盖公共业务字段
 //        vo.setAmount(commission.getAmount());
 //        vo.setAmount(commission.getAmount());

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

@@ -450,6 +450,7 @@ 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. 新事务，比对
@@ -1034,7 +1035,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         expected.setCommissionDate(commission.getCommissionDate());
         expected.setCommissionDate(commission.getCommissionDate());
         expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
         expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
         expected.setStatusDesc("比对成功，通过手动同步预计来佣"); // 设置状态描述为比对成功
         expected.setStatusDesc("比对成功，通过手动同步预计来佣"); // 设置状态描述为比对成功
-        expected.setRemark(null);
+        expected.setRemark(expected.getStatusDesc());
 
 
         expected.setCreatorId(loginUserId);
         expected.setCreatorId(loginUserId);
         expected.setCreateTime(new Date());
         expected.setCreateTime(new Date());

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedNewVO.java

@@ -218,12 +218,6 @@ public class CommissionExpectedNewVO implements Serializable {
     private Object premium;
     private Object premium;
 
 
     /**
     /**
-     * 入账检核记录-通用备注
-     */
-//    @Schema(description = "备注")
-    private String realRemark;
-
-    /**
      * 入账检核记录-更新人名称
      * 入账检核记录-更新人名称
      */
      */
     private String realUpdaterName;
     private String realUpdaterName;
@@ -235,9 +229,20 @@ public class CommissionExpectedNewVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date realUpdateTime;
     private Date realUpdateTime;
 
 
+    /**
+     * 修改理由
+     */
+    private String statusDesc;
 
 
+    /**
+     * 人工备注
+     */
+    private String manualRemark;
 
 
-
+    /**
+     * 通用备注
+     */
+    private String remark;