切换test 提交代码

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.insurance.VehicleType;
 import com.ydtech.modules.ins.model.vo.*;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.api.dajia.constants.TypeVehicleMapping;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -45,7 +44,7 @@ public class RuleAttrMappingVo {
     public static List<RuleAttrMappingVo> getRuleAttrMappingVoList(InsAreaCompany insAreaCompany, InsOrders insOrders,
                                                                    List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList, PtlNewCarJudgeRules carJudgeRule) {
         List<RuleAttrMappingVo> ruleAttrMappingVoList = new ArrayList<>();
-        CarInfoVo carInfo = insOrders.getCarinfo().toJavaObject(CarInfoVo.class);
+        InsAreaCompanyCarInfo carInfo = insAreaCompany.getCarinfo();
         //车牌号
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("LicenseNo", carInfo.getLicenseNo()));
         //品牌型号
@@ -61,7 +60,7 @@ public class RuleAttrMappingVo {
         //核定载质量
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("AuthorizedLoadWeight", carInfo.getLimitLoad()));
         //整备质量
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("CurbWeight", carInfo.getVehicleweight()));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("CurbWeight", carInfo.getVehicleWeight()));
         //能源类型
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("NewEnergy", carInfo.getEnergyType()));
         //注册日期
@@ -102,7 +101,7 @@ public class RuleAttrMappingVo {
 //       ruleAttrMappingVoList.add(new RuleAttrMappingVo("RenewalofInsurance", carInfo.isTransferFlagBi() ? "1"));
 
 
-        CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
+        InsAreaCompanyCarUserInfo ownerInfo = insAreaCompany.getOwnerInfo();
         //车主 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnersIDNumber", ownerInfo.getIdentifyNumber().substring(0, 6)));
         //车主 年龄
@@ -112,7 +111,7 @@ public class RuleAttrMappingVo {
         //车主 姓名
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnerName", ownerInfo.getName()));
 
-        CustomerInfoVo policyHolderInfo = insOrders.getApplyinfo().toJavaObject(CustomerInfoVo.class);
+        InsAreaCompanyCarUserInfo policyHolderInfo = insAreaCompany.getApplyInfo();
         //投保人 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantIDNumber", policyHolderInfo.getIdentifyNumber().substring(0, 6)));
         //投保人 年龄
@@ -120,7 +119,7 @@ public class RuleAttrMappingVo {
         //投保人 性别
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantSex", policyHolderInfo.getGender().equals("男") ? "1" : "2"));
 
-        CustomerInfoVo insuredPersonInfo = insOrders.getInsureinfo().toJavaObject(CustomerInfoVo.class);
+        InsAreaCompanyCarUserInfo insuredPersonInfo = insAreaCompany.getInsureInfo();
         //被保人 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredIDNumber", insuredPersonInfo.getIdentifyNumber().substring(0, 6)));
         //被保人 年龄
@@ -128,72 +127,72 @@ public class RuleAttrMappingVo {
         //被保人 性别
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredSex", insuredPersonInfo.getGender().equals("男") ? "1" : "2"));
 
-        List<KindInfoVo> kindInfoVos = insOrders.getKing().toJavaList(KindInfoVo.class);
+        List<InsAreaCompanyKing> kingInfoVos = insAreaCompany.getKing();
         //险别信息
-        kindInfoVos.forEach(kindInfoVo -> {
+        kingInfoVos.forEach(kingInfoVo -> {
             //机动车损失险
-            if (InsurKind.A.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("MotorVehicleDamageInsurance", String.valueOf(kindInfoVo.getAmount())));
+            if (InsurKind.A.getCode().equals(kingInfoVo.getKindCode()))
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("MotorVehicleDamageInsurance", String.valueOf(kingInfoVo.getAmount())));
             //第三者责任险
-            if (InsurKind.B.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));
+            if (InsurKind.B.getCode().equals(kingInfoVo.getKindCode()))
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(kingInfoVo.getAmount())));
             //司机责任险
-            if (InsurKind.D3.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));
+            if (InsurKind.D3.getCode().equals(kingInfoVo.getKindCode()))
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverLiabilityInsurance", String.valueOf(kingInfoVo.getAmount())));
             //乘客责任险
-            if (InsurKind.D4.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("PassengerLiabilityInsurance", String.valueOf(kindInfoVo.getUnitAmount())));
+            if (InsurKind.D4.getCode().equals(kingInfoVo.getKindCode()))
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("PassengerLiabilityInsurance", String.valueOf(kingInfoVo.getUnitAmount())));
             //车身划痕险
-            if (InsurKind.L.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarScratchInsurance", String.valueOf(kindInfoVo.getAmount())));
+            if (InsurKind.L.getCode().equals(kingInfoVo.getKindCode()))
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarScratchInsurance", String.valueOf(kingInfoVo.getAmount())));
             //绝对免赔率特约险（车损）
-            if (InsurKind.MJ1.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.MJ1.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleDamageAbsoluteDeductibleSpecialInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //绝对免赔率特约险（三者）
-            if (InsurKind.MJ2.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.MJ2.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdAbsoluteDeductibleSpecialInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //绝对免赔率特约险（司机）
-            if (InsurKind.MJ3.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.MJ3.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverAbsoluteDeductibleSpecialInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //绝对免赔率特约险（乘客）
-            if (InsurKind.MJ4.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.MJ4.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("PassengerAbsoluteDeductibleSpecialInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //附加医保-三者
-            if (InsurKind.SY_FJ_YBW1.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.SY_FJ_YBW1.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyAdditionalMedicalInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //附加医保-座位险(乘客)
-            if (InsurKind.SY_FJ_YBW2.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.SY_FJ_YBW2.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("PassengerAdditionalMedicalInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //附加医保-座位险(司机)
-            if (InsurKind.SY_FJ_YBW3.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.SY_FJ_YBW3.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverAdditionalMedicalInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //法定节假日限额翻倍险
-            if (InsurKind.BD.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.BD.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("LegalHolidayLimitDoublingInsurance",
-                        String.valueOf(kindInfoVo.getAmount())));
+                        String.valueOf(kingInfoVo.getAmount())));
             //道路救援服务特约条款
-            if (InsurKind.TY1.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.TY1.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("RoadsideAssistanceServiceSpecialClause",
-                        String.valueOf(kindInfoVo.getServiceTimes())));
+                        String.valueOf(kingInfoVo.getServiceTimes())));
             //车辆安全检测特约条款
-            if (InsurKind.TY2.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.TY2.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleSafetyInspectionSpecialClause",
-                        String.valueOf(kindInfoVo.getServiceTimes())));
+                        String.valueOf(kingInfoVo.getServiceTimes())));
             //代为驾驶服务特约条款
-            if (InsurKind.TY3.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.TY3.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("SubstituteDrivingServiceSpecialClause",
-                        String.valueOf(kindInfoVo.getServiceTimes())));
+                        String.valueOf(kingInfoVo.getServiceTimes())));
             //代为送检服务特约条款
-            if (InsurKind.TY4.getCode().equals(kindInfoVo.getKindCode()))
+            if (InsurKind.TY4.getCode().equals(kingInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("SubstituteInspectionServiceSpecialClause",
-                        String.valueOf(kindInfoVo.getServiceTimes())));
+                        String.valueOf(kingInfoVo.getServiceTimes())));
         });
 
         //交强保费

src/main/java/com/ydtech/modules/order/aop/aspect/AuditVerificationAspect.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -52,7 +53,7 @@ public class AuditVerificationAspect {
                 companyId = arg.toString();
             }
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
-            InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+            InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
 
             //再进行费用因子判断
             try {

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyKindMapper.java

@@ -1,9 +1,8 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
-import com.ydtech.modules.order.entity.InsAreaCompanyKind;
+import com.ydtech.modules.order.entity.InsAreaCompanyKing;
 
-public interface InsAreaCompanyKindMapper extends BaseMapper<InsAreaCompanyKind> {
+public interface InsAreaCompanyKindMapper extends BaseMapper<InsAreaCompanyKing> {
 
 }

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -2,14 +2,12 @@ package com.ydtech.modules.order.entity;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.utils.StringUtils;
@@ -23,6 +21,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 报价渠道
@@ -73,29 +72,6 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "inscompany")
     private String inscompany;
 
-    @TableField(value = "car_info_id")
-    private String carInfoId;
-
-    @TableField(value = "owner_id")
-    private String ownerId;
-
-    @TableField(value = "apply_id")
-    private String applyId;
-
-    @TableField(value = "insure_id")
-    private String insureId;
-
-    /**
-     * 请求报文
-     */
-    @TableField(value = "reqtxt", typeHandler = FastjsonTypeHandler.class)
-    private JSONObject reqtxt;
-    /**
-     * 响应报文
-     */
-    @TableField(value = "reptxt", typeHandler = FastjsonTypeHandler.class)
-    private JSONObject reptxt;
-
     /**
      * 交强投保单号
      */
@@ -132,18 +108,6 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "accident_info", typeHandler = FastjsonTypeHandler.class)
     private JSONArray accidentInfo;
 
-    /**
-     * 交强险商业险
-     */
-    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
-    private JSONArray riskinfo;
-
-    /**
-     * 商业险信息
-     */
-    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
-    private JSONArray kindinfo;
-
     /**
      * 交强险费用
      */
@@ -374,8 +338,49 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "inside_pay_time")
     private String insidePayTime;
 
+    /**
+     * 车辆信息
+     */
+    @TableField(exist = false)
+    private InsAreaCompanyCarInfo carinfo;
+
+    /**
+     * 车主信息
+     */
     @TableField(exist = false)
-    private InsOrdersCarInfo carinfo;
+    private InsAreaCompanyCarUserInfo ownerInfo;
+
+    /**
+     * 投保人信息
+     */
+    @TableField(exist = false)
+    private InsAreaCompanyCarUserInfo applyInfo;
+
+    /**
+     * 被保人信息
+     */
+    @TableField(exist = false)
+    private InsAreaCompanyCarUserInfo insureInfo;
+
+    /**
+     * 保险信息
+     */
+    @TableField(exist = false)
+    private List<InsAreaCompanyRisk> risk;
+
+    /**
+     * 商业险信息
+     */
+    @TableField(exist = false)
+    private List<InsAreaCompanyKing> king;
+
+    /**
+     * 欠税信息
+     */
+    @TableField(exist = false)
+    private InsAreaCompanyTaxArrears taxArrearsInfo;
+
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -417,8 +422,6 @@ public class InsAreaCompany implements Serializable {
         this.taxamount = BigDecimal.valueOf(quoteRespVo.getTaxAmount());
         this.sumpremium = BigDecimal.valueOf(quoteRespVo.getSumPermium());
         this.accidentInfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getAccidentInfo()));
-        this.riskinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList()));
-        this.kindinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList()));
         this.orderstatus = InsOrderStatusEnum.QUOTE_ING.getCode();
 
         this.jqStartDate = quoteRespVo.getStartDateJq();

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyKind.java → src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyKing.java

@@ -4,12 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.po.InsOrdersKind;
-import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
 import java.util.List;
@@ -22,8 +19,8 @@ import java.util.stream.Collectors;
  */
 @TableName(value = "ins_area_company_kind", autoResultMap = true)
 @Data
-@ApiModel(value = "子订单车辆人员信息")
-public class InsAreaCompanyKind implements Serializable {
+@ApiModel(value = "子订单商业险信息")
+public class InsAreaCompanyKing implements Serializable {
     /**
      * id
      */
@@ -84,11 +81,11 @@ public class InsAreaCompanyKind implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-    public InsAreaCompanyKind(){
+    public InsAreaCompanyKing(){
 
     }
 
-    public InsAreaCompanyKind(KindInfoVo kindInfoVo, String orderNo) {
+    public InsAreaCompanyKing(KindInfoVo kindInfoVo, String orderNo) {
         this.companyId = orderNo;
         this.amount = kindInfoVo.getAmount();
         this.unitAmount = kindInfoVo.getUnitAmount();

src/main/java/com/ydtech/modules/order/entity/bo/InsOrdersBo.java

@@ -289,7 +289,7 @@ public class InsOrdersBo {
     }
 
     //设置车主信息
-    public void setCarUserInfo(InsOrders insOrders, List<InsOrdersCarUserInfo> carUserInfoList) {
+    public void setCarUserInfo(List<InsOrdersCarUserInfo> carUserInfoList) {
         carUserInfoList.forEach(carUserInfo -> {
             switch(carUserInfo.getUserType()){
                 case 1:

src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java

@@ -145,7 +145,7 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
             this.orderstatus = insAreaCompany.getOrderstatus();
             this.companyId = insAreaCompany.getId();
             this.inscompany = insAreaCompany.getInscompany();
-            this.kindList = ObjectUtils.isEmpty(insAreaCompany.getKindinfo()) ? new ArrayList<>() :
+            this.kindList = ObjectUtils.isEmpty(insAreaCompany.getKing()) ? new ArrayList<>() :
                     insAreaCompany.getKindinfo().toJavaList(QuoteKindRespVo.class);
             this.jqPremium = insAreaCompany.getJqpremium().doubleValue();
             this.syPremium = insAreaCompany.getSypremium().doubleValue();

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyKindService.java

@@ -2,8 +2,7 @@ package com.ydtech.modules.order.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.InsAreaCompanyKind;
-import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
+import com.ydtech.modules.order.entity.InsAreaCompanyKing;
 
 /**
  * 子订单车辆信息(InsAreaCompanyCarInfo)表服务接口
@@ -11,7 +10,7 @@ import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
  * @author tz
  * @since 2024-03-15 11:19:18
  */
-public interface InsAreaCompanyKindService extends IService<InsAreaCompanyKind> {
+public interface InsAreaCompanyKindService extends IService<InsAreaCompanyKing> {
 
     boolean saveKinds(String companyId, JSONArray kinds);
 

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyKindServiceImpl.java

@@ -2,11 +2,8 @@ package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.order.dao.InsAreaCompanyCarUserInfoMapper;
 import com.ydtech.modules.order.dao.InsAreaCompanyKindMapper;
-import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
-import com.ydtech.modules.order.entity.InsAreaCompanyKind;
-import com.ydtech.modules.order.service.InsAreaCompanyCarUserInfoService;
+import com.ydtech.modules.order.entity.InsAreaCompanyKing;
 import com.ydtech.modules.order.service.InsAreaCompanyKindService;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.stereotype.Service;
@@ -20,11 +17,11 @@ import java.util.List;
  * @since 2024-03-15 11:19:18
  */
 @Service
-public class InsAreaCompanyKindServiceImpl extends ServiceImpl<InsAreaCompanyKindMapper, InsAreaCompanyKind> implements InsAreaCompanyKindService {
+public class InsAreaCompanyKindServiceImpl extends ServiceImpl<InsAreaCompanyKindMapper, InsAreaCompanyKing> implements InsAreaCompanyKindService {
 
     @Override
     public boolean saveKinds(String companyId, JSONArray kinds) {
-        List<InsAreaCompanyKind> kindList = JSONArray.parseArray(kinds.toJSONString(), InsAreaCompanyKind.class);
+        List<InsAreaCompanyKing> kindList = JSONArray.parseArray(kinds.toJSONString(), InsAreaCompanyKing.class);
         kindList.forEach(kind -> {
             kind.setCompanyId(companyId);
             kind.setId(IdGenerate.nextId());

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -53,11 +53,11 @@ import com.ydtech.modules.order.entity.bo.UnderwritingRulesBo;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsOrdersTrackService;
+import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
@@ -132,6 +132,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Autowired
     private SysUserLinkPtlAgreementMapper sysUserLinkPtlAgreementMapper;
 
+    @Autowired
+    private InsOrdersCarUserInfoService  insOrdersCarUserInfoService;
+
+    @Autowired
+    private InsOrdersCarInfoService insOrdersCarInfoService;
+
 
     
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
@@ -211,8 +217,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()).orderByAsc(InsOrders::getCreatetime).last("limit 1");
         InsOrders insOrders = baseMapper.selectOne(wrapper);
         if (!ObjectUtils.isEmpty(insOrders)) {
-            JSONObject carinfo = insOrders.getCarinfo();
-            CarInfoVo carInfoVo = JSON.parseObject(carinfo.toJSONString(), CarInfoVo.class);
+            CarInfoVo carInfoVo = JSON.parseObject(JSONObject.toJSONString(insOrders.getCarinfo()), CarInfoVo.class);
             CarModelDTO carModelDTO = CarModelDTOConvert.INSTANCE.CarInfoVotoCarModelDTO(carInfoVo);
             return Collections.singletonList(carModelDTO);
         }
@@ -856,22 +861,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             return null;
         }
         BeanUtils.copyProperties(insOrders,insOrdersBo);
-        List<String> originalList = new ArrayList<>();
-        originalList.add(insOrders.getOwnerId());
-        originalList.add(insOrders.getApplyId());
-        originalList.add(insOrders.getInsureId());
-        //车主id去重
-        List<String> uniqueList = originalList.stream()
-                .distinct()
-                .collect(Collectors.toList());
-
-        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.listByIds(uniqueList);
+
+        List<InsOrdersCarUserInfo> ordersCarUserInfos = insOrdersCarUserInfoService.getCarUserInfoByOrderNo(orderNo);
+
         //设置车主信息
-        insOrdersBo.setCarUserInfo(insOrders, insOrdersCarUserInfos);
+        insOrdersBo.setCarUserInfo(ordersCarUserInfos);
         //获取车辆信息
-        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(insOrders.getCarInfoId());
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByOrderNo(orderNo);
         insOrdersBo.setCarAllInfo(insOrdersCarInfo);
         return insOrdersBo;
-
     }
 }

src/main/java/com/ydtech/modules/xxl/handler/SyncInsAreaCompany.java

@@ -82,7 +82,7 @@ public class SyncInsAreaCompany {
             List<InsAreaCompanyCarInfo> insAreaCompanyCarInfos = new ArrayList<>();
             List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
             List<InsAreaCompanyRisk> insAreaCompanyRisks = new ArrayList<>();
-            List<InsAreaCompanyKind> insAreaCompanyKinds = new ArrayList<>();
+            List<InsAreaCompanyKing> insAreaCompanyKings = new ArrayList<>();
             List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = new ArrayList<>();
 
 
@@ -149,12 +149,12 @@ public class SyncInsAreaCompany {
                     if (insAreaCompanyOld.getKindinfo() != null) {
 
                         insAreaCompanyOld.getKindinfo().forEach(kindObj -> {
-                            InsAreaCompanyKind insAreaCompanyKind = new InsAreaCompanyKind();
+                            InsAreaCompanyKing insAreaCompanyKing = new InsAreaCompanyKing();
                             JSONObject kind = (JSONObject) kindObj;
-                            insAreaCompanyKind = JSONObject.parseObject(kind.toJSONString(), InsAreaCompanyKind.class);
-                            insAreaCompanyKind.setId(IdGenerate.nextId());
-                            insAreaCompanyKind.setCompanyId(insAreaCompany.getId());
-                            insAreaCompanyKinds.add(insAreaCompanyKind);
+                            insAreaCompanyKing = JSONObject.parseObject(kind.toJSONString(), InsAreaCompanyKing.class);
+                            insAreaCompanyKing.setId(IdGenerate.nextId());
+                            insAreaCompanyKing.setCompanyId(insAreaCompany.getId());
+                            insAreaCompanyKings.add(insAreaCompanyKing);
                         });
                     }
                     //5 处理 task
@@ -177,7 +177,7 @@ public class SyncInsAreaCompany {
             insAreaCompanyCarInfoService.saveBatch(insAreaCompanyCarInfos);
             insAreaCompanyCarUserInfoService.saveBatch(insAreaCompanyCarUserInfos);
             insAreaCompanyRiskService.saveBatch(insAreaCompanyRisks);
-            insAreaCompanyKindService.saveBatch(insAreaCompanyKinds);
+            insAreaCompanyKindService.saveBatch(insAreaCompanyKings);
             insAreaCompanyTaxArrearsService.saveBatch(insAreaCompanyTaxArrears);
 
         }