预计发佣查询结算币种8

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

@@ -2,6 +2,9 @@ package com.yd.csf.api.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
@@ -355,9 +358,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
     }
     }
 
 
     private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, QueryPolicyAndBrokerDto queryPolicyAndBrokerDto) {
     private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, QueryPolicyAndBrokerDto queryPolicyAndBrokerDto) {
-        //查询转介人职级比例
-
-
         //查询结算币种
         //查询结算币种
         ApiAnnouncementCommissionRatioListRequest request = new ApiAnnouncementCommissionRatioListRequest();
         ApiAnnouncementCommissionRatioListRequest request = new ApiAnnouncementCommissionRatioListRequest();
         request.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
         request.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
@@ -368,19 +368,17 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
 
         log.info("查询结算币种->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result));
         log.info("查询结算币种->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result));
 
 
-
-
         if (result.getCode() == 200) {
         if (result.getCode() == 200) {
 
 
-            // 使用 Map 来处理数据，避免 effectiveEnd 字段的类型不匹配问题
+            // 使用 Map 来处理数据
             Object data = result.getData();
             Object data = result.getData();
-
-            List<Map<String, Object>> announcementRatioList = (List<Map<String, Object>>) JSON.parse(JSON.toJSONString(data));
+            // 将数据转换为JSONObject进行解析
+            JSONArray announcementRatioList = JSONUtil.parseArray(data);
 
 
             //查询默认结算汇率
             //查询默认结算汇率
-            if (CollUtil.isNotEmpty(announcementRatioList)) {
-                Map<String, Object> announcementRatio = announcementRatioList.get(0);
-                String currency = (String) announcementRatio.get("currency");
+            if (!announcementRatioList.isEmpty()) {
+                JSONObject announcementRatio = announcementRatioList.get(0, JSONObject.class);
+                String currency = announcementRatio.getStr("currency");
                 BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency);
                 BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency);
 
 
                 for (ExpectedFortune expectedFortune : expectedFortuneList) {
                 for (ExpectedFortune expectedFortune : expectedFortuneList) {
@@ -390,8 +388,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                     expectedFortune.setDefaultExchangeRate(exchangeRate);
                     expectedFortune.setDefaultExchangeRate(exchangeRate);
                     //设置港币金额（标准发佣金额 * 默认结算汇率）
                     //设置港币金额（标准发佣金额 * 默认结算汇率）
                     expectedFortune.setHkdAmount(expectedFortune.getAmount().multiply(exchangeRate));
                     expectedFortune.setHkdAmount(expectedFortune.getAmount().multiply(exchangeRate));
-                    //设置转介人职级比例
-
 
 
                     iExpectedFortuneService.lambdaUpdate()
                     iExpectedFortuneService.lambdaUpdate()
                             .set(ExpectedFortune::getCurrency, currency)
                             .set(ExpectedFortune::getCurrency, currency)