Merge remote-tracking branch 'origin/test' into test

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

@@ -3,6 +3,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.core.convert.Converter;
 import cn.hutool.core.convert.Converter;
+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;
@@ -10,6 +13,8 @@ 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.google.gson.reflect.TypeToken;
 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;
@@ -28,11 +33,14 @@ import com.yd.csf.feign.request.expectedfortune.*;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneResponse;
 import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneResponse;
 import com.yd.csf.service.dto.CommissionRuleBindingDto;
 import com.yd.csf.service.dto.CommissionRuleBindingDto;
+import com.yd.csf.service.dto.PolicyProductInfo;
 import com.yd.csf.service.dto.QueryPolicyAndBrokerDto;
 import com.yd.csf.service.dto.QueryPolicyAndBrokerDto;
 import com.yd.csf.service.dto.QueryPolicyBrokerDto;
 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.AddressVO;
 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;
@@ -371,8 +379,16 @@ 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 && ObjectUtils.isNotEmpty(result.getData())) {
-            List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = result.getData();
+
+
+        if (result.getCode() == 200) {
+
+            // 直接使用Map来处理数据，避免复杂的类型转换
+            Object data = result.getData();
+
+            List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = GSONUtil.fromJson(JSON.toJSONString(data), new TypeReference<List<ApiAnnouncementCommissionRatioListResponse>>() {
+            }.getType());
+
             //查询默认结算汇率
             //查询默认结算汇率
             if (CollUtil.isNotEmpty(announcementRatioList)) {
             if (CollUtil.isNotEmpty(announcementRatioList)) {
                 ApiAnnouncementCommissionRatioListResponse announcementRatio = announcementRatioList.get(0);
                 ApiAnnouncementCommissionRatioListResponse announcementRatio = announcementRatioList.get(0);