出账检核-增加币种3

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

@@ -480,12 +480,12 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             log.info("结算汇率：{}", exchangeRate);
 
             for (ExpectedFortune expectedFortune : expectedFortuneList) {
-                //设置结算货币
-                expectedFortune.setCurrency(currency);
-                //设置默认结算汇率
+                //设置保单币种
+                expectedFortune.setRuleCurrency(currency);
+                //设置默认保单币种 -> 港币汇率
                 expectedFortune.setDefaultExchangeRate(exchangeRate);
-                //设置港币金额（标准发佣金额 * 默认结算汇率）
-                expectedFortune.setHkdAmount(expectedFortune.getAmount().multiply(exchangeRate));
+                //设置港币金额（标准发佣金额 * 默认保单币种 -> 港币汇率）
+                expectedFortune.setHkdAmount(expectedFortune.getRuleAmount().multiply(exchangeRate));
                 //默认值
                 expectedFortune.setPaidAmount(BigDecimal.ZERO);
                 expectedFortune.setPaidRatio(BigDecimal.ZERO);
@@ -859,15 +859,15 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
                     // 计算实际预计发佣金额 = 标准发佣金额 × decimalRatio
                     BigDecimal actualAmount = standardAmount.multiply(decimalRatio);
-                    fortune.setAmount(actualAmount);
+                    fortune.setRuleAmount(actualAmount);
 
                 } catch (NumberFormatException e) {
                     // 如果比例不是有效的数字，使用标准金额
-                    fortune.setAmount(standardAmount);
+                    fortune.setRuleAmount(standardAmount);
                 } catch (Exception e) {
                     // 其他异常处理
                     log.error("计算发佣金额异常: {}", brokerRatioStr, e);
-                    fortune.setAmount(standardAmount);
+                    fortune.setRuleAmount(standardAmount);
                 }
 
                 fortuneList.add(fortune);

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

@@ -141,7 +141,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             ApiExpectedFortunePageResponse vo = new ApiExpectedFortunePageResponse();
             BeanUtils.copyProperties(ef, vo);
 
-            vo.setCurrencyName(CurrencyEnum.toLabel(ef.getCurrency()));
+            vo.setCurrencyName("港币");
 
             String ratio = finalBrokerRatioMap.get(ef.getBrokerBizId());
             vo.setCommissionRatio(ratio);