预计发佣查询结算币种7

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

@@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.base.feign.client.exchangerate.ApiExchangeRateFeignClient;
 import com.yd.base.feign.client.exchangerate.ApiExchangeRateFeignClient;
@@ -32,7 +31,6 @@ import com.yd.csf.service.dto.QueryPolicyBrokerDto;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.service.*;
-import com.yd.csf.service.utils.GSONUtil;
 import com.yd.csf.service.vo.ExpectedFortuneExportDTO;
 import com.yd.csf.service.vo.ExpectedFortuneExportDTO;
 import com.yd.csf.service.vo.ExpectedFortuneStatisticsVO;
 import com.yd.csf.service.vo.ExpectedFortuneStatisticsVO;
 import com.yd.csf.service.vo.PayableReportVO;
 import com.yd.csf.service.vo.PayableReportVO;
@@ -374,16 +372,15 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
 
         if (result.getCode() == 200) {
         if (result.getCode() == 200) {
 
 
-            // 直接使用Map来处理数据，避免复杂的类型转换
+            // 使用 Map 来处理数据，避免 effectiveEnd 字段的类型不匹配问题
             Object data = result.getData();
             Object data = result.getData();
 
 
-            List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = GSONUtil.fromJson(JSON.toJSONString(data), new TypeReference<List<ApiAnnouncementCommissionRatioListResponse>>() {
-            }.getType());
+            List<Map<String, Object>> announcementRatioList = (List<Map<String, Object>>) JSON.parse(JSON.toJSONString(data));
 
 
             //查询默认结算汇率
             //查询默认结算汇率
             if (CollUtil.isNotEmpty(announcementRatioList)) {
             if (CollUtil.isNotEmpty(announcementRatioList)) {
-                ApiAnnouncementCommissionRatioListResponse announcementRatio = announcementRatioList.get(0);
-                String currency = announcementRatio.getCurrency();
+                Map<String, Object> announcementRatio = announcementRatioList.get(0);
+                String currency = (String) announcementRatio.get("currency");
                 BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency);
                 BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency);
 
 
                 for (ExpectedFortune expectedFortune : expectedFortuneList) {
                 for (ExpectedFortune expectedFortune : expectedFortuneList) {