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

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

@@ -2,10 +2,6 @@ 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.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;
@@ -14,7 +10,6 @@ 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.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,26 +23,22 @@ import com.yd.csf.api.dto.*;
 import com.yd.csf.api.service.ApiBasicLawCalculateService;
 import com.yd.csf.api.service.ApiBasicLawCalculateService;
 import com.yd.csf.api.service.ApiExpectedFortuneLogService;
 import com.yd.csf.api.service.ApiExpectedFortuneLogService;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
-import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.expectedfortune.*;
 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.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;
 import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient;
 import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient;
 import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
 import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
 import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
 import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
-import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesListResponse;
 import com.yd.user.feign.client.clientuser.ApiClientUserFeignClient;
 import com.yd.user.feign.client.clientuser.ApiClientUserFeignClient;
 import com.yd.user.feign.client.sysdict.ApiSysDictFeignClient;
 import com.yd.user.feign.client.sysdict.ApiSysDictFeignClient;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;