前端对接问题修复40

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

@@ -10,9 +10,9 @@ import java.util.Date;
 @Data
 @Data
 public class FortuneUpdateRequest implements Serializable {
 public class FortuneUpdateRequest implements Serializable {
     /**
     /**
-     * 保单发佣业务id
+     * 保单出账业务id
      */
      */
-    @Schema(description = "保单发佣业务id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "保单出账业务id", requiredMode = Schema.RequiredMode.REQUIRED)
     private String fortuneBizId;
     private String fortuneBizId;
 
 
     /**
     /**
@@ -34,15 +34,15 @@ public class FortuneUpdateRequest implements Serializable {
     private String policyNo;
     private String policyNo;
 
 
     /**
     /**
-     * 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
+     * 出账期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
      */
      */
-    @Schema(description = "发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
+    @Schema(description = "出账期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
     private Integer fortunePeriod;
     private Integer fortunePeriod;
 
 
     /**
     /**
-     * 发佣总期数
+     * 出账总期数
      */
      */
-    @Schema(description = "发佣总期数")
+    @Schema(description = "出账总期数")
     private Integer fortuneTotalPeriod;
     private Integer fortuneTotalPeriod;
 
 
     /**
     /**
@@ -70,33 +70,33 @@ public class FortuneUpdateRequest implements Serializable {
     private String teamBizId;
     private String teamBizId;
 
 
     /**
     /**
-     * 发佣名称
+     * 出账名称
      */
      */
-    @Schema(description = "发佣名称")
+    @Schema(description = "出账名称")
     private String fortuneName;
     private String fortuneName;
 
 
     /**
     /**
-     * 发佣类型
+     * 出账类型
      */
      */
-    @Schema(description = "发佣类型")
+    @Schema(description = "出账类型")
     private String fortuneType;
     private String fortuneType;
 
 
     /**
     /**
-     * 发佣金额
+     * 本期出账金额
      */
      */
-    @Schema(description = "发佣金额")
-    private BigDecimal amount;
+    @Schema(description = "本期出账金额")
+    private BigDecimal currentPaymentAmount;
 
 
     /**
     /**
-     * 发佣币种
+     * 出账币种
      */
      */
-    @Schema(description = "发佣币种")
+    @Schema(description = "出账币种")
     private String currency;
     private String currency;
 
 
     /**
     /**
-     * 发佣日期
+     * 出账日期
      */
      */
-    @Schema(description = "发佣日期")
+    @Schema(description = "出账日期")
     private Date payoutDate;
     private Date payoutDate;
 
 
     /**
     /**

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

@@ -173,10 +173,12 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         }
         }
 
 
         // 如果是部分出账，新增一条待出账的实际出账记录（fortune）
         // 如果是部分出账，新增一条待出账的实际出账记录（fortune）
-        if (fortuneUpdateRequest.getAmount().compareTo(expectedFortune.getAmount()) < 0) {
+        BigDecimal currentPaymentAmount = fortuneUpdateRequest.getCurrentPaymentAmount();
+        if (currentPaymentAmount != null && currentPaymentAmount.compareTo(BigDecimal.ZERO) > 0 && currentPaymentAmount.compareTo(expectedFortune.getAmount()) < 0) {
             Fortune newFortune = new Fortune();
             Fortune newFortune = new Fortune();
-            BeanUtils.copyProperties(fortune, newFortune);
-            newFortune.setAmount(expectedFortune.getAmount().subtract(fortuneUpdateRequest.getAmount()));
+            BeanUtils.copyProperties(fortune, newFortune, "id", "fortuneBizId");
+            newFortune.setAmount(expectedFortune.getAmount());
+            newFortune.setCurrentPaymentAmount(expectedFortune.getAmount().subtract(currentPaymentAmount));
             newFortune.setStatus(FortuneStatusEnum.WAIT.getItemValue());
             newFortune.setStatus(FortuneStatusEnum.WAIT.getItemValue());
             newFortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
             newFortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
             newFortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
             newFortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
@@ -205,7 +207,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
 
     private String calculateReconciliationYearMonth(Fortune fortune) {
     private String calculateReconciliationYearMonth(Fortune fortune) {
         // 出账年月为次月
         // 出账年月为次月
-        LocalDate reconciliationDate = LocalDate.parse(fortune.getReconciliationYearMonth() + "-01").plusMonths(1);
+        LocalDate reconciliationDate = LocalDate.now().plusMonths(1);
         return reconciliationDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
         return reconciliationDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
     }
     }