Merge remote-tracking branch 'origin/test' into test

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

@@ -1079,7 +1079,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         BigDecimal hkdToPayoutRate = editExchangeRateRequest.getHkdToPayoutRate();
         BigDecimal hkdToPayoutRate = editExchangeRateRequest.getHkdToPayoutRate();
         BigDecimal hkdAmount = editExchangeRateRequest.getHkdAmount();
         BigDecimal hkdAmount = editExchangeRateRequest.getHkdAmount();
 
 
-        // 更新 fortune 的结算汇率、港币金额
+        // 更新 fortune 的字段
         this.lambdaUpdate()
         this.lambdaUpdate()
                 .set(Fortune::getRuleAmount, ruleAmount)
                 .set(Fortune::getRuleAmount, ruleAmount)
                 .set(Fortune::getRuleCurrency, ruleCurrency)
                 .set(Fortune::getRuleCurrency, ruleCurrency)
@@ -1094,7 +1094,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 .eq(Fortune::getId, fortune.getId())
                 .eq(Fortune::getId, fortune.getId())
                 .update();
                 .update();
 
 
-        // 更新 expected fortune 的出账原币种结算汇率、港币金额
+        // 更新 expected fortune 的字段
         expectedFortuneService.lambdaUpdate()
         expectedFortuneService.lambdaUpdate()
                 .set(ExpectedFortune::getRuleAmount, ruleAmount)
                 .set(ExpectedFortune::getRuleAmount, ruleAmount)
                 .set(ExpectedFortune::getRuleCurrency, ruleCurrency)
                 .set(ExpectedFortune::getRuleCurrency, ruleCurrency)

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

@@ -168,24 +168,60 @@ public class FortuneVO implements Serializable {
     private String fortuneType;
     private String fortuneType;
 
 
     /**
     /**
-     * 出账金额
+     * 保单币种金额
      */
      */
-    @Schema(description = "应出账金额")
-    private BigDecimal amount;
+    @Schema(description = "保单币种金额")
+    private BigDecimal ruleAmount;
 
 
     /**
     /**
-     * 出账币种
+     * 保单币种
      */
      */
-    @Schema(description = "出账币种")
-    private String currency;
+    @Schema(description = "保单币种")
+    private String ruleCurrency;
 
 
     /**
     /**
-     * 结算汇率
+     * 保单币种→港币汇率（入账检核汇率）
      */
      */
-    @Schema(description = "结算汇率")
+    @Schema(description = "保单币种→港币汇率（入账检核汇率）")
     private BigDecimal exchangeRate;
     private BigDecimal exchangeRate;
 
 
     /**
     /**
+     * 原币种
+     */
+    @Schema(description = "原币种")
+    private String originalCurrency;
+
+    /**
+     * 原币种金额
+     */
+    @Schema(description = "原币种金额")
+    private BigDecimal originalAmount;
+
+    /**
+     * 原币种→港币汇率
+     */
+    @Schema(description = "原币种→港币汇率")
+    private BigDecimal originalToHkdRate;
+
+    /**
+     * 发放币种
+     */
+    @Schema(description = "发放币种")
+    private String payoutCurrency;
+
+    /**
+     * 发放币种金额
+     */
+    @Schema(description = "发放币种金额")
+    private BigDecimal payoutAmount;
+
+    /**
+     * 港币→发放币种汇率
+     */
+    @Schema(description = "港币→发放币种汇率")
+    private BigDecimal hkdToPayoutRate;
+
+    /**
      * 港币出账金额
      * 港币出账金额
      */
      */
     @Schema(description = "港币出账金额")
     @Schema(description = "港币出账金额")