فهرست منبع

提交比价接口,修改收支明细的查询bug处理

hxl13994548489 2 سال پیش
والد
کامیت
6f01e5ea85

+ 10 - 7
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -247,7 +247,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();  // 记录
         sysUserAccountHistory.setDocumentary(1);  // 1提现
         sysUserAccountHistory.setUserId(userId);
-        sysUserAccountHistory.setProperty(3);
+        sysUserAccountHistory.setProperty(6);
         sysUserAccountHistory.setBusinessSegmentsType(1);
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
@@ -357,7 +357,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();  // 记录
         sysUserAccountHistory.setDocumentary(1);  // 1支出
         sysUserAccountHistory.setUserId(userId);
-        sysUserAccountHistory.setProperty(3); //3提现
+        sysUserAccountHistory.setProperty(6); //3提现
         sysUserAccountHistory.setBusinessSegmentsType(1);
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
@@ -974,14 +974,14 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Page<MyCollectInAdvanceDto> page = new Page<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize());
         //page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
-        if (myIncomeAndExpensesQueryDto.getBusinessSegmentsType() != null && "0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
+        if ("0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
             myIncomeAndExpensesQueryDto.setBusinessSegmentsType(null);
         }
-        if (myIncomeAndExpensesQueryDto.getTransactionType() != null && "0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+        if ("0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
             myIncomeAndExpensesQueryDto.setTransactionType(null);
         }
-        if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
-            myIncomeAndExpensesQueryDto.setTransactionType(null);
+        if ("0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
+            myIncomeAndExpensesQueryDto.setIncomeAndExpensesType(null);
         }
         // 1为车险板块  1 收入时
         if ( StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&   StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"1".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
@@ -1011,6 +1011,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             myIncomeAndExpensesQueryDto.setTransactionType("4");
         } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"4".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
             myIncomeAndExpensesQueryDto.setTransactionType("5");
+        } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("6");
         }
         //处理收入和支出类型转换
         if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
@@ -1039,8 +1041,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     dto.setIncomeAndExpensesType("1");
                     dto.setTransactionType("4");
                     //提现
-                }else if("3".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
+                }else if("6".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("2");
+                    dto.setTransactionType("3");
                 }
                 recordsNew.add(dto);
             }

+ 12 - 4
src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -10,11 +10,11 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.service.SysUserIsDialService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.constants.OrderLinkTypeConstants;
 import com.ydtech.modules.order.entity.*;
+import com.ydtech.modules.order.entity.dto.InquiryDetalsQueryDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.*;
@@ -22,15 +22,12 @@ import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -396,4 +393,15 @@ public class InsOrdersController extends BaseController {
     public HttpResult savePosition(@RequestBody InsAreaCompanyPosition insAreaCompanyPosition){
         return HttpResult.ok(insAreaCompanyPositionService.save(insAreaCompanyPosition));
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/24 18:07
+     *  @Description: 通过子订单ids获取比价信息
+     */
+    @PostMapping("/getInquiryDetalsBySubOrderNos")
+    @ApiOperation(value = "通过子订单ids获取比价信息")
+    public HttpResult<InquiryDetalsVo> getInquiryDetalsBySubOrderNos(@RequestBody InquiryDetalsQueryDto inquiryDetalsDto){
+        return HttpResult.ok(insOrdersService.getInquiryDetalsBySubOrderIds(inquiryDetalsDto));
+    }
 }

+ 18 - 0
src/main/java/com/ydtech/modules/order/entity/dto/InquiryDetalsQueryDto.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.order.entity.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/24 18:10
+ *  @Description:  询价信息的前台传参对象
+ */
+@Data
+public class InquiryDetalsQueryDto {
+
+    private List<String>  subOrderNos=new ArrayList<String>();
+}

+ 50 - 0
src/main/java/com/ydtech/modules/order/entity/vo/InquiryDetalsVo.java

@@ -0,0 +1,50 @@
+package com.ydtech.modules.order.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/24 18:10
+ *  @Description:  询价详情对象
+ */
+@Data
+public class InquiryDetalsVo implements Serializable {
+    /***
+     *  主订单信息
+     */
+    @ApiModelProperty("主订单信息")
+    private InsOrderVo  insOrderVo=new InsOrderVo();
+
+    /***
+     * 子订单列表信息
+     */
+    @ApiModelProperty("子订单列表信息")
+    private List<SubOrderVo>  subOrderVos=new ArrayList<SubOrderVo>();
+    /***
+     * 比价信息
+     */
+    @ApiModelProperty("比价列表信息")
+    private List<List<String>>  parityPriceVo=new ArrayList<List<String>>();
+
+    /***
+     * 最优惠公司
+     */
+    @ApiModelProperty("最优惠公司")
+    private String companyName;
+
+    public InquiryDetalsVo() {
+    }
+
+    public InquiryDetalsVo(InsOrderVo insOrderVo, List<SubOrderVo> subOrderVos, List<List<String>> parityPriceVo, String companyName) {
+        this.insOrderVo = insOrderVo;
+        this.subOrderVos = subOrderVos;
+        this.parityPriceVo = parityPriceVo;
+        this.companyName = companyName;
+    }
+}

+ 86 - 0
src/main/java/com/ydtech/modules/order/entity/vo/InsOrderVo.java

@@ -0,0 +1,86 @@
+package com.ydtech.modules.order.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/24 18:28
+ *  @Description:  主订单信息
+ */
+@Data
+public class InsOrderVo implements Serializable {
+
+
+    @ApiModelProperty("主订单号")
+    private String  orderNo;
+
+    @ApiModelProperty("车架号")
+    private String frameNo;
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    @ApiModelProperty("品牌型号")
+    private String brandName;
+
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+    @ApiModelProperty("座位数")
+    private String seatCount;
+
+    @ApiModelProperty("车主姓名")
+    private String carOwnerName;
+
+    @ApiModelProperty("车主身份证号")
+    private String ownerIdentifyNumber;
+
+    @ApiModelProperty("投保人姓名")
+    private String applyName;
+
+    @ApiModelProperty("投保人身份证号")
+    private String applyIdentifyNumber;
+
+    @ApiModelProperty("被保人姓名")
+    private String insuredName;
+
+    @ApiModelProperty("被保人身份证号")
+    private String insuredNumber;
+
+    @ApiModelProperty("交强险开始时间")
+    private String jqstartDate;
+
+    @ApiModelProperty("交强险结束时间")
+    private String jqendDate;
+
+    @ApiModelProperty("商业险开始时间")
+    private String systartDate;
+
+    @ApiModelProperty("商业险结束时间")
+    private String syendDate;
+
+    public InsOrderVo() {
+    }
+
+    public InsOrderVo(String orderNo, String frameNo, String licenseNo,String brandName, String engineNo, String seatCount, String carOwnerName, String ownerIdentifyNumber, String applyName, String applyIdentifyNumber, String insuredName, String insuredNumber, String jqstartDate, String jqendDate, String systartDate, String syendDate) {
+        this.orderNo = orderNo;
+        this.frameNo = frameNo;
+        this.licenseNo = licenseNo;
+        this.brandName = brandName;
+        this.engineNo = engineNo;
+        this.seatCount = seatCount;
+        this.carOwnerName = carOwnerName;
+        this.ownerIdentifyNumber = ownerIdentifyNumber;
+        this.applyName = applyName;
+        this.applyIdentifyNumber = applyIdentifyNumber;
+        this.insuredName = insuredName;
+        this.insuredNumber = insuredNumber;
+        this.jqstartDate = jqstartDate;
+        this.jqendDate = jqendDate;
+        this.systartDate = systartDate;
+        this.syendDate = syendDate;
+    }
+}

+ 71 - 0
src/main/java/com/ydtech/modules/order/entity/vo/SubOrderVo.java

@@ -0,0 +1,71 @@
+package com.ydtech.modules.order.entity.vo;
+
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/24 18:28
+ *  @Description:  子订单信息
+ */
+@Data
+public class SubOrderVo {
+
+    /***
+     * 公司公司名称
+     */
+    @ApiModelProperty("公司公司名称")
+    private String  companyName;
+
+
+    @ApiModelProperty("交强险保费")
+    private BigDecimal jqpremium;
+    /***
+     * 交强险种信息
+     */
+    @ApiModelProperty("交强险种列表信息")
+    private JSONArray jqInsuranceType;
+
+    @ApiModelProperty("商业险保费")
+    private BigDecimal sypremium;
+    /***
+     * 商业险种列表信息
+     */
+    @ApiModelProperty("商业险种列表信息")
+    private JSONArray  kindinfo;
+
+
+    @ApiModelProperty(value = "车船税费用")
+    private BigDecimal taxaMount;
+
+
+    @ApiModelProperty("驾意险保费")
+    private  BigDecimal jypremium;
+    /***
+     * 意外险种列表信息
+     */
+    @ApiModelProperty("驾意险种列表信息")
+    private  JSONArray accidentInfo;
+
+    @ApiModelProperty("总保费")
+    private BigDecimal sumpremium;
+
+    public SubOrderVo() {
+    }
+
+    public SubOrderVo(String companyName, BigDecimal jqpremium, JSONArray jqInsuranceType, BigDecimal sypremium, JSONArray kindinfo, BigDecimal taxaMount, BigDecimal jypremium, JSONArray accidentInfo, BigDecimal sumpremium) {
+        this.companyName = companyName;
+        this.jqpremium = jqpremium;
+        this.jqInsuranceType = jqInsuranceType;
+        this.sypremium = sypremium;
+        this.kindinfo = kindinfo;
+        this.taxaMount = taxaMount;
+        this.jypremium = jypremium;
+        this.accidentInfo = accidentInfo;
+        this.sumpremium = sumpremium;
+    }
+}

+ 8 - 0
src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -8,6 +8,7 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.dto.InquiryDetalsQueryDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
@@ -194,4 +195,11 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @return
      */
     Page<OrderExpirationVo> getExpirationInsure(Page page,OrderExpirationQueryVo orderExpirationQueryVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/24 18:14
+     *  @Description:  通过子订单号查询询价信息
+     */
+    InquiryDetalsVo getInquiryDetalsBySubOrderIds(InquiryDetalsQueryDto inquiryDetalsDto);
 }

+ 194 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -13,7 +13,6 @@ import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.InsuranceEnum;
 import com.ydtech.constants.enums.dict.DictionaryData;
 import com.ydtech.constants.enums.dict.DictionaryManagement;
-import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse;
@@ -51,6 +50,7 @@ import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
+import com.ydtech.modules.order.entity.dto.InquiryDetalsQueryDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenQuoteVo;
@@ -1251,4 +1251,197 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         expirationInsure.setRecords(records);
         return expirationInsure;
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/24 18:14
+     *  @Description:  通过子订单号查询询价详情信息
+     */
+    @Override
+    public InquiryDetalsVo getInquiryDetalsBySubOrderIds(InquiryDetalsQueryDto inquiryDetalsDto) {
+        //通过其中一个子订单id查询主订单的id
+        if(inquiryDetalsDto.getSubOrderNos()==null || inquiryDetalsDto.getSubOrderNos().size()==0){
+            throw new SystemException("子订单号数组为空不能比价");
+        }
+        if(inquiryDetalsDto.getSubOrderNos()!=null && inquiryDetalsDto.getSubOrderNos().size()==1){
+            throw new SystemException("子订单号数据为一个不能比价");
+        }
+        String subOrderNo = inquiryDetalsDto.getSubOrderNos().get(0);
+        InsAreaCompany  insAreaCompany = insAreaCompanyService.getById(subOrderNo);
+        //主订单信息
+        InsOrders orders = this.getById(insAreaCompany.getOrderno());
+        InsOrderVo  insOrderVo = getInsOrderVoDetals(orders);
+        List<List<String>>  priceList=new ArrayList<>();
+        List<String> companyList=new ArrayList<>();
+        companyList.add("公司");
+        List<String> jqList=new ArrayList<>();
+        jqList.add("交强险");
+        List<String> syList=new ArrayList<>();
+        syList.add("商业险");
+        List<String> ccList=new ArrayList<>();
+        ccList.add("车船税");
+        List<String> jyList=new ArrayList<>();
+        jyList.add("驾意险");
+        List<String> zbfList=new ArrayList<>();
+        zbfList.add("总保费");
+        List<String> yhjList=new ArrayList<>();
+        yhjList.add("优惠金额");
+        List<String> yhhList=new ArrayList<>();
+        yhhList.add("优惠后");
+        List<String> yhhbjList=new ArrayList<>();
+        List<SubOrderVo> subOrderVos=new ArrayList<>();
+
+        if(inquiryDetalsDto.getSubOrderNos()!=null && inquiryDetalsDto.getSubOrderNos().size()>0){
+            for(String subOrderId :inquiryDetalsDto.getSubOrderNos()){
+                BigDecimal sumyh =BigDecimal.ZERO;
+                InsAreaCompany  insAreaCompanySingle = insAreaCompanyService.getById(subOrderId);
+                //查询费用信息
+                InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
+                        .eq(InsFeeOrderNew::getInsOrderNo, subOrderNo));
+                if (!Objects.isNull(insFeeOrderNew)) {
+                    PtlAgreementProductCostsNew ptlAgreementProductCostsNew =
+                            ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
+                    FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
+                    //优惠信息
+                    if(feeOrderNewVo!=null && feeOrderNewVo.getExportFee()!=null && feeOrderNewVo.getExportFee().size()>0){
+                        sumyh = feeOrderNewVo.getExportFee()
+                                .stream()
+                                .map(FeeOrderNewVo.ExportFee::getTotalAmount)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+                }
+                SubOrderVo subOrderVo = new SubOrderVo(insAreaCompanySingle.getInscompany(), insAreaCompanySingle.getJqpremium(), getJQRiskList(insAreaCompanySingle),
+                        insAreaCompanySingle.getSypremium(), insAreaCompanySingle.getKindinfo()==null?new JSONArray():insAreaCompanySingle.getKindinfo(),
+                        insAreaCompanySingle.getTaxamount(), insAreaCompanySingle.getJypremium(), getJYRiskList(insAreaCompanySingle), insAreaCompanySingle.getSumpremium());
+                //保险公司名称
+                companyList.add(insAreaCompanySingle.getInscompany());
+                jqList.add(insAreaCompanySingle.getJqpremium().toString());
+                syList.add(insAreaCompanySingle.getSypremium().toString());
+                ccList.add(insAreaCompanySingle.getTaxamount().toString());
+                jyList.add(insAreaCompanySingle.getJypremium().toString());
+                zbfList.add(insAreaCompanySingle.getSumpremium().toString());
+                yhjList.add(sumyh.toString());
+                //优惠后金额
+                BigDecimal sumyhh = insAreaCompanySingle.getSumpremium().subtract(sumyh);
+                yhhList.add(sumyhh.toString());
+                yhhbjList.add(sumyhh.toString());
+                subOrderVos.add(subOrderVo);
+            }
+            priceList.add(companyList);
+            priceList.add(jqList);
+            priceList.add(syList);
+            priceList.add(ccList);
+            priceList.add(jyList);
+            priceList.add(zbfList);
+            priceList.add(yhjList);
+            priceList.add(yhhList);
+        }
+        //最优惠公司
+        String companyName = getCompanyNameByMinAmount(yhhbjList, companyList);
+        return new InquiryDetalsVo(insOrderVo,subOrderVos,priceList,companyName);
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/25 9:47
+     *  @Description: 获取优惠后最低的公司
+     */
+    private static String getCompanyNameByMinAmount(List<String> yhhbjList, List<String> companyList) {
+        int minIndex=0;
+        if(yhhbjList !=null && yhhbjList.size()>0){
+            String minValue = yhhbjList.get(0);
+            for (int i = 1; i < yhhbjList.size(); i++) {
+                if (minValue.compareTo(yhhbjList.get(i)) > 0) {
+                    minIndex = i;
+                }
+            }
+        }
+        return  companyList.get(minIndex+1);
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/25 9:13
+     *  @Description:  获取驾意险信息
+     */
+    private JSONArray getJYRiskList(InsAreaCompany insAreaCompanySingle) {
+        InsAreaCompanyAccidentalDriving insAreaCompanyAccidentalDriving = insAreaCompanyAccidentalDrivingService.getByCompanyId(insAreaCompanySingle.getCompanyId());
+        if (insAreaCompanyAccidentalDriving != null) {
+            List<InsDrivingIntentionInsuranceSon> insDrivingIntentionInsuranceSon = insDrivingIntentionInsuranceService.getInsDrivingIntentionInsuranceSon(
+                    insAreaCompanySingle.getCompanyId(),
+                    insAreaCompanyAccidentalDriving.getRideRiskCode());
+            if(insDrivingIntentionInsuranceSon.size() == 1 && insDrivingIntentionInsuranceSon.get(0).getPremium() == null) {
+                insDrivingIntentionInsuranceSon.get(0).setPremium(insAreaCompanySingle.getJypremium().toString());
+            }
+            JSONArray accidentInfo = JSON.parseArray(JSON.toJSONString(insDrivingIntentionInsuranceSon));
+            return accidentInfo;
+        }else{
+            return new JSONArray();
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/25 9:06
+     *  @Description:  获取交强险险种列表
+     */
+    private static JSONArray getJQRiskList(InsAreaCompany insAreaCompanySingle) {
+        if(insAreaCompanySingle.getProductid().equals(ProductsType.PT_0330.getCode()) ||
+                insAreaCompanySingle.getProductid().equals(ProductsType.PT_0330034001.getCode()) ||
+                insAreaCompanySingle.getProductid().equals(ProductsType.PT_0330034002.getCode())) {
+            return JqInsuranceType.toJsonArray();
+        }else{
+            return new JSONArray();
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/24 18:58
+     *  @Description: 返回详情信息
+     */
+    private InsOrderVo getInsOrderVoDetals(InsOrders orders) {
+        JSONObject carinfo = orders.getCarinfo();
+        JSONObject ownerinfo = orders.getOwnerinfo();
+        JSONObject applyinfo = orders.getApplyinfo();
+        JSONObject insureinfo = orders.getInsureinfo();
+        InsOrderVo insOrderVo =new InsOrderVo(StringUtils.isEmpty(orders.getOrderno())?"":orders.getOrderno(),
+                StringUtils.isEmpty(orders.getFrameno())?"":orders.getFrameno(),
+                StringUtils.isEmpty(orders.getLicenseno())?"":orders.getLicenseno(),
+                StringUtils.isEmpty(carinfo.getString("brandName"))?"":carinfo.getString("brandName"),
+                StringUtils.isEmpty(carinfo.getString("engineNo"))?"":carinfo.getString("engineNo"),
+                StringUtils.isEmpty(carinfo.getString("seatCount"))?"":carinfo.getString("seatCount"),
+                StringUtils.isEmpty(ownerinfo.getString("name"))?"":ownerinfo.getString("name"),
+                setNewIdCard(ownerinfo),
+                StringUtils.isEmpty(applyinfo.getString("name"))?"":applyinfo.getString("name"),
+                setNewIdCard(applyinfo),
+                StringUtils.isEmpty(insureinfo.getString("name"))?"":insureinfo.getString("name"),
+                setNewIdCard(insureinfo),
+                StringUtils.isEmpty(orders.getJqstartdate())?"":orders.getJqstartdate(),
+                StringUtils.isEmpty(orders.getJqenddate())?"":orders.getJqenddate(),
+                StringUtils.isEmpty(orders.getSystartdate())?"":orders.getSystartdate(),
+                StringUtils.isEmpty(orders.getSyenddate())?"": orders.getSyenddate());
+        return  insOrderVo;
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/9 16:18
+     *  @Description:  处理身份证为01返回身份证
+     */
+    private static String setNewIdCard(JSONObject ownerinfo) {
+        String identify="";
+        if(ownerinfo !=null ){
+            String identifyType = ownerinfo.getString("identifyNumber");
+            if(StringUtils.isNotBlank(identifyType)){
+                identify=identifyType.replaceAll("(\\d{4})\\d{10}(\\d{4})", "$1****$2");
+            }
+        }
+        return identify;
+    }
 }