出账检核-增加币种39

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -158,36 +158,57 @@ public class ApiExpectedFortunePageResponse {
     private String ruleCurrency;
     private String ruleCurrency;
 
 
     /**
     /**
-     * 出账币种名称
-     */
-    @Schema(description = "出账币种名称")
-    private String currencyName;
-
-    /**
-     * 保单币种 -> 港币汇率
+     * 预计出账-默认保单币种汇率（保单币种 -> 港币汇率）
      */
      */
-    @Schema(description = "保单币种 -> 港币汇率")
+    @Schema(description = "预计出账-默认保单币种汇率（保单币种 -> 港币汇率）")
     private BigDecimal defaultExchangeRate;
     private BigDecimal defaultExchangeRate;
 
 
     /**
     /**
-     * HKD应出账金额
+     * 预计出账-HKD应出账金额
      */
      */
-    @Schema(description = "HKD应出账金额")
+    @Schema(description = "预计出账-HKD应出账金额")
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
+
+    // ========== 原币种及金额 ==========
+    @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;
+
+
     /**
     /**
-     * 本次出账金额（HKD）
+     * 实际出账-本次出账金额（HKD）
      */
      */
-    @Schema(description = "本次出账金额（HKD）")
+    @Schema(description = "实际出账-本次出账金额（HKD）")
     private BigDecimal currentPaymentHkdAmount;
     private BigDecimal currentPaymentHkdAmount;
 
 
     /**
     /**
-     * 本期结算汇率
+     * 实际出账-本期结算汇率
      */
      */
-    @Schema(description = "本期结算汇率")
+    @Schema(description = "实际出账-本期结算汇率")
     private BigDecimal exchangeRate;
     private BigDecimal exchangeRate;
 
 
     /**
     /**
+     * 出账币种名称
+     */
+    @Schema(description = "出账币种名称")
+    private String currencyName;
+
+    /**
      * 出账状态
      * 出账状态
      */
      */
     @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计出账对应的来佣 字典值: csf_expected_fortune_status")
     @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计出账对应的来佣 字典值: csf_expected_fortune_status")
@@ -214,36 +235,30 @@ public class ApiExpectedFortunePageResponse {
     private LocalDate actualPayoutDate;
     private LocalDate actualPayoutDate;
 
 
     /**
     /**
-     * 已出账金额（HKD）
+     * 预计出账-已出账金额（HKD）
      */
      */
-    @Schema(description = "已出账金额（HKD）")
+    @Schema(description = "预计出账-已出账金额（HKD）")
     private BigDecimal paidAmount;
     private BigDecimal paidAmount;
 
 
     /**
     /**
-     * 待出账金额
+     * 预计出账-待出账金额
      */
      */
-    @Schema(description = "待出账金额")
+    @Schema(description = "预计出账-待出账金额")
     private BigDecimal unpaidAmount;
     private BigDecimal unpaidAmount;
 
 
     /**
     /**
-     * 已出账比例 已出账金额/应出账金额
+     * 预计出账-已出账金额比例 已出账金额/应出账金额
      */
      */
-    @Schema(description = "已出账比例 已出账金额/应出账金额")
+    @Schema(description = "预计出账-已出账金额比例 已出账金额/应出账金额")
     private BigDecimal paidRatio;
     private BigDecimal paidRatio;
 
 
     /**
     /**
-     * 待出账比例 待出账金额/应出账金额
+     * 预计出账-待出账比例 待出账金额/应出账金额
      */
      */
-    @Schema(description = "待出账比例 待出账金额/应出账金额")
+    @Schema(description = "预计出账-待出账比例 待出账金额/应出账金额")
     private BigDecimal unpaidRatio;
     private BigDecimal unpaidRatio;
 
 
     /**
     /**
-     * 基本法项目配置表唯一业务ID
-     */
-    @Schema(description = "rule item biz id")
-    private String ruleItemBizId;
-
-    /**
      * 备注
      * 备注
      */
      */
     @Schema(description = "备注")
     @Schema(description = "备注")

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

@@ -282,17 +282,17 @@ public class FortuneVO implements Serializable {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 出账日(估) / 预计发佣月
+     * 出账年月(估) / 预计发佣月
      */
      */
-    @Schema(description = "出账日(估) / 预计发佣月")
+    @Schema(description = "出账年月(估) / 预计发佣月")
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private LocalDate payoutDate;
     private LocalDate payoutDate;
 
 
     /**
     /**
-     * 出账日(实)
+     * 出账年月(实)
      */
      */
-    @Schema(description = "出账日(实)")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "出账年月(实)")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private LocalDate actualPayoutDate;
     private LocalDate actualPayoutDate;
 
 
     /**
     /**

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

@@ -255,9 +255,9 @@
             f.current_payment_amount,
             f.current_payment_amount,
             f.exchange_rate,
             f.exchange_rate,
             NULL as paid_amount,
             NULL as paid_amount,
-            0 as unpaid_amount,
-            f.current_payment_ratio as paid_ratio,
-            0 as unpaid_ratio,
+            NULL as unpaid_amount,
+            NULL as paid_ratio,
+            NULL as unpaid_ratio,
             f.is_tax,
             f.is_tax,
             f.tax_amount,
             f.tax_amount,
             f.net_amount,
             f.net_amount,