薪资发放页面字段调整2

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalarySplitServiceImpl.java

@@ -133,8 +133,8 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         // 查询统计信息
         // 查询统计信息
         ApiSalarySplitStatisticsDto statisticsDto = new ApiSalarySplitStatisticsDto();
         ApiSalarySplitStatisticsDto statisticsDto = new ApiSalarySplitStatisticsDto();
         FortuneAccount fortuneAccount = fortuneAccountService.queryOne(request.getFortuneAccountBizId());
         FortuneAccount fortuneAccount = fortuneAccountService.queryOne(request.getFortuneAccountBizId());
-        // 出账币种
-        statisticsDto.setBeSplitCurrency(fortuneAccount != null ? fortuneAccount.getCurrency() : "");
+        // 发放币种
+        statisticsDto.setBeSplitCurrency(fortuneAccount != null ? fortuneAccount.getPayoutCurrency() : "");
 
 
         BigDecimal beSplitAmount = BigDecimal.ZERO;
         BigDecimal beSplitAmount = BigDecimal.ZERO;
         if (fortuneAccount != null) {
         if (fortuneAccount != null) {
@@ -239,7 +239,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
 
 
         // 4. 封装响应
         // 4. 封装响应
         ApiQueryRemainingResponse response = new ApiQueryRemainingResponse();
         ApiQueryRemainingResponse response = new ApiQueryRemainingResponse();
-        response.setCurrency(fortuneAccount.getCurrency());
+        response.setCurrency(fortuneAccount.getPayoutCurrency());
         response.setFromAmount(beSplitAmount);
         response.setFromAmount(beSplitAmount);
         return Result.success(response);
         return Result.success(response);
     }
     }
@@ -260,7 +260,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         //原币种金额
         //原币种金额
         convertRequest.setAmount(request.getFromAmount());
         convertRequest.setAmount(request.getFromAmount());
         //原币种
         //原币种
-        convertRequest.setFromCurrency(fortuneAccount.getCurrency());
+        convertRequest.setFromCurrency(fortuneAccount.getPayoutCurrency());
         //目标币种
         //目标币种
         convertRequest.setToCurrency(request.getToCurrency());
         convertRequest.setToCurrency(request.getToCurrency());
         //调用远程转换接口
         //调用远程转换接口

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

@@ -51,10 +51,16 @@ public class FortuneAccountVO {
     private String team;
     private String team;
 
 
     /**
     /**
-     * 出账币种
+     * 发放币种
      */
      */
-    @Schema(description = "出账币种")
-    private String currency;
+    @Schema(description = "发放币种")
+    private String payoutCurrency;
+
+    /**
+     * 发放金额
+     */
+    @Schema(description = "发放金额")
+    private BigDecimal payoutAmount;
 
 
     /**
     /**
      * 港币出账金额
      * 港币出账金额