sys_car_info sys_car_user_info 改表名

src/main/java/com/ydtech/modules/admin/dao/SysCarInfoMapper.java

@@ -1,17 +0,0 @@
-package com.ydtech.modules.admin.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface SysCarInfoMapper extends BaseMapper<SysCarInfo> {
-
-
-
-}
-
-
-
-

src/main/java/com/ydtech/modules/admin/dao/SysCarUserInfoMapper.java

@@ -1,17 +0,0 @@
-package com.ydtech.modules.admin.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.admin.model.SysUserInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface SysCarUserInfoMapper extends BaseMapper<SysCarUserInfo> {
-
-
-
-}
-
-
-
-

src/main/java/com/ydtech/modules/admin/service/SysCarInfoService.java

@@ -1,22 +0,0 @@
-package com.ydtech.modules.admin.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-
-public interface SysCarInfoService extends IService<SysCarInfo> {
-
-    /**
-     * 是否存在车辆信息
-     * @param idCard 身份证号
-     * @return
-     */
-    boolean isExist(String idCard);
-
-    SysCarInfo getCarInfoByFrameNo(String frameNo);
-
-}
-
-
-

src/main/java/com/ydtech/modules/admin/service/impl/SysCarInfoServiceImpl.java

@@ -1,52 +0,0 @@
-package com.ydtech.modules.admin.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.admin.dao.SysCarInfoMapper;
-import com.ydtech.modules.admin.dao.SysCarUserInfoMapper;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-
-@Service
-public class SysCarInfoServiceImpl extends ServiceImpl<SysCarInfoMapper, SysCarInfo>
-        implements SysCarInfoService {
-
-    /**
-     * 是否存在车主用户信息
-     * @param licenseNo 身份证号
-     * @return
-     */
-    public boolean isExist(String licenseNo){
-        LambdaQueryWrapper<SysCarInfo> eq = new LambdaQueryWrapper<SysCarInfo>().eq(SysCarInfo::getLicenseNo, licenseNo);
-        SysCarInfo sysCarInfo = baseMapper.selectOne(eq);
-        if(!Objects.isNull(sysCarInfo))
-            return true;
-        return false;
-    }
-
-    /**
-     * 根据车牌号查询车辆信息
-     * @param frameNo
-     * @return
-     */
-    @Override
-    public SysCarInfo getCarInfoByFrameNo(String frameNo) {
-        LambdaQueryWrapper<SysCarInfo> eq = new LambdaQueryWrapper<SysCarInfo>().eq(SysCarInfo::getFrameNo, frameNo);
-        return baseMapper.selectOne(eq);
-    }
-}
-
-
-
-
-
-
-
-

src/main/java/com/ydtech/modules/admin/service/impl/SysCarUserInfoServiceImpl.java

@@ -1,49 +0,0 @@
-package com.ydtech.modules.admin.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.admin.dao.SysCarUserInfoMapper;
-import com.ydtech.modules.admin.dao.SysUserInfoMapper;
-import com.ydtech.modules.admin.model.SysUserInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
-import com.ydtech.modules.admin.service.SysUserInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-
-@Service
-public class SysCarUserInfoServiceImpl extends ServiceImpl<SysCarUserInfoMapper, SysCarUserInfo>
-        implements SysCarUserInfoService {
-
-    /**
-     * 是否存在车主用户信息
-     * @param idCard 身份证号
-     * @return
-     */
-    public boolean isExist(String idCard){
-        SysCarUserInfo sysCarUserInfo = baseMapper.selectOne(new LambdaQueryWrapper<SysCarUserInfo>()
-                .eq(SysCarUserInfo::getIdentifyNumber, idCard));
-        return !Objects.isNull(sysCarUserInfo);
-    }
-
-    /**
-     * 根据身份证查找车主用户信息
-     * @param idCard
-     * @return
-     */
-    @Override
-    public SysCarUserInfo getCarUserInfoByIdCard(String idCard) {
-        return baseMapper.selectOne(new LambdaQueryWrapper<SysCarUserInfo>()
-                .eq(SysCarUserInfo::getIdentifyNumber, idCard));
-    }
-}
-
-
-
-
-
-
-
-

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

@@ -1,23 +1,16 @@
 package com.ydtech.modules.fee.dto.vo;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.ydtech.constants.enums.InsurKind;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.ins.model.vo.*;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.po.InsOrdersKind;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.service.InsOrdersService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -40,7 +33,7 @@ public class RuleAttrMappingVo {
 
     public static List<RuleAttrMappingVo> getRuleAttrMappingVoList(InsAreaCompany insAreaCompany, InsOrders insOrders) {
         List<RuleAttrMappingVo> ruleAttrMappingVoList = new ArrayList<>();
-        SysCarInfo carInfo = insOrders.getCarinfo();
+        InsOrdersCarInfo carInfo = insOrders.getCarinfo();
         //车牌号
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("LicenseNo", carInfo.getLicenseNo()));
         //品牌型号
@@ -73,7 +66,7 @@ public class RuleAttrMappingVo {
 //       ruleAttrMappingVoList.add(new RuleAttrMappingVo("RenewalofInsurance", carInfo.isTransferFlagBi() ? "1"));
 
 
-        SysCarUserInfo ownerInfo = insOrders.getOwnerinfo();
+        InsOrdersCarUserInfo ownerInfo = insOrders.getOwnerinfo();
         //车主 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnersIDNumber", ownerInfo.getIdentifyNumber().substring(0, 6)));
         //车主 年龄
@@ -83,7 +76,7 @@ public class RuleAttrMappingVo {
         //车主 姓名
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnerName", ownerInfo.getName()));
 
-        SysCarUserInfo policyHolderInfo = insOrders.getApplyinfo();
+        InsOrdersCarUserInfo policyHolderInfo = insOrders.getApplyinfo();
         //投保人 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantIDNumber", policyHolderInfo.getIdentifyNumber().substring(0, 6)));
         //投保人 年龄
@@ -91,7 +84,7 @@ public class RuleAttrMappingVo {
         //投保人 性别
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantSex", policyHolderInfo.getGender()));
 
-        SysCarUserInfo insuredPersonInfo = insOrders.getInsureinfo();
+        InsOrdersCarUserInfo insuredPersonInfo = insOrders.getInsureinfo();
         //被保人 证件号码（前6位）
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredIDNumber", insuredPersonInfo.getIdentifyNumber().substring(0, 6)));
         //被保人 年龄

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -3,14 +3,9 @@ package com.ydtech.modules.fee.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.model.po.SysUserAccount;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
-import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmRetail;
@@ -21,24 +16,19 @@ import com.ydtech.modules.fee.dto.vo.RuleAttrMappingVo;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.InsOrdersKindService;
 import com.ydtech.modules.order.service.InsOrdersRiskService;
 import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.protocol.service.*;
 import com.ydtech.modules.protocols.entity.po.*;
 import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
 import com.ydtech.modules.protocols.service.*;
-import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -81,10 +71,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     private SysUserAccountService  sysUserAccountService;
 
     @Resource
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Resource
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Resource
     private InsOrdersRiskService insOrdersRiskService;

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

@@ -3,21 +3,14 @@ package com.ydtech.modules.order.aop.aspect;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.alibaba.fastjson.JSONObject;
-import com.ydtech.constants.sys.SystemConstant;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysUserRole;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserRoleService;
-import com.ydtech.modules.base.controller.BaseController;
 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.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersKindService;
@@ -25,7 +18,6 @@ import com.ydtech.modules.order.service.InsOrdersRiskService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
 import com.ydtech.modules.protocol.service.impl.TaxSourceServiceImpl;
-import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -34,7 +26,6 @@ import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 @Slf4j
@@ -57,9 +48,9 @@ public class AuditVerificationAspect {
 
     private final InsOrdersService insOrdersService;
 
-    private final SysCarInfoService sysCarInfoService;
+    private final InsOrdersCarInfoService insOrdersCarInfoService;
 
-    private final SysCarUserInfoService sysCarUserInfoService;
+    private final InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     private final InsOrdersRiskService insOrdersRiskService;
 
@@ -81,13 +72,13 @@ public class AuditVerificationAspect {
             InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
 
             //获取车辆信息
-            insOrders.setCarinfo(sysCarInfoService.getById(insAreaCompany.getCarInfoId()));
+            insOrders.setCarinfo(insOrdersCarInfoService.getById(insAreaCompany.getCarInfoId()));
             //获取人员信息
             List<String> userIds = new ArrayList<>();
             userIds.add(insAreaCompany.getOwnerId());
             userIds.add(insAreaCompany.getInsureId());
             userIds.add(insAreaCompany.getApplyId());
-            List<SysCarUserInfo> userList = sysCarUserInfoService.list(new LambdaQueryWrapper<SysCarUserInfo>().in(SysCarUserInfo::getId, userIds));
+            List<InsOrdersCarUserInfo> userList = insOrdersCarUserInfoService.list(new LambdaQueryWrapper<InsOrdersCarUserInfo>().in(InsOrdersCarUserInfo::getId, userIds));
             userList.forEach(user -> {
                 if(user.getId().equals(insAreaCompany.getOwnerId())){
                     insOrders.setOwnerinfo(user);

src/main/java/com/ydtech/modules/order/controller/DaJiaOrderController.java

@@ -43,11 +43,11 @@ public class DaJiaOrderController {
     @PostMapping(value = "/submitImage")
     @ApiOperation(value = "提交影像信息")
     public HttpResult<Object> submitImage(@RequestSingleParam(value = "companyId") String companyId) {
-        return this.daJiaOrderService.submitImage(companyId);
-//        return HttpResult.ok("ok");
+//        return this.daJiaOrderService.submitImage(companyId);
+        return HttpResult.ok("ok");
     }
 
-//    @AuditVerification("核保")
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {

src/main/java/com/ydtech/modules/order/controller/YongChengOrderApiController.java

@@ -7,6 +7,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.esm.model.EsmInsAttachInsure;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
@@ -50,6 +51,7 @@ public class YongChengOrderApiController {
         return yongchengOrderApiService.quoteApi(quoteVo);
     }
 
+    @AuditVerification("核保")
     @ApiOperation(value = "永诚API方式 - 核保")
     @PostMapping("/audit")
     public HttpResult auditApi(@RequestSingleParam(value = "companyId") String companyId) {
@@ -59,7 +61,8 @@ public class YongChengOrderApiController {
     @ApiOperation(value = "永诚API方式 - 影像上传")
     @PostMapping(value = "/uploadImage")
     public HttpResult uploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
-        return yongchengOrderApiService.uploadImageApi(companyId);
+//        return yongchengOrderApiService.uploadImageApi(companyId);
+        return HttpResult.ok("ok");
     }
 
     @ApiOperation(value = "永诚API方式 -电子保单")

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

@@ -0,0 +1,16 @@
+package com.ydtech.modules.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InsOrdersCarInfoMapper extends BaseMapper<InsOrdersCarInfo> {
+
+
+
+}
+
+
+
+

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

@@ -0,0 +1,16 @@
+package com.ydtech.modules.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InsOrdersCarUserInfoMapper extends BaseMapper<InsOrdersCarUserInfo> {
+
+
+
+}
+
+
+
+

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

@@ -9,8 +9,7 @@ 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.admin.model.po.SysCarInfo;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
+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.idgen.IdGenerate;
@@ -18,14 +17,10 @@ import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 报价渠道
@@ -360,7 +355,7 @@ public class InsAreaCompany implements Serializable {
     private String insidePayTime;
 
     @TableField(exist = false)
-    private SysCarInfo carinfo;
+    private InsOrdersCarInfo carinfo;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -8,15 +7,12 @@ 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.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.po.InsOrdersKind;
 import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import lombok.*;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -193,16 +189,16 @@ public class InsOrders implements Serializable {
     private String carInfoId;
 
     @TableField(exist = false)
-    private SysCarInfo carinfo;
+    private InsOrdersCarInfo carinfo;
 
     @TableField(exist = false)
-    private SysCarUserInfo applyinfo;
+    private InsOrdersCarUserInfo applyinfo;
 
     @TableField(exist = false)
-    private SysCarUserInfo ownerinfo;
+    private InsOrdersCarUserInfo ownerinfo;
 
     @TableField(exist = false)
-    private SysCarUserInfo insureinfo;
+    private InsOrdersCarUserInfo insureinfo;
 
     @TableField(exist = false)
     private List<InsOrdersRisk> risk;
@@ -258,7 +254,7 @@ public class InsOrders implements Serializable {
     }
 
 
-    public void setCarUserInfo(InsOrders insOrders, List<SysCarUserInfo> carUserInfoList) {
+    public void setCarUserInfo(InsOrders insOrders, List<InsOrdersCarUserInfo> carUserInfoList) {
         carUserInfoList.forEach(carUserInfo -> {
             if (carUserInfo.getId().equals(insOrders.getApplyId())) {
                 this.setApplyinfo(carUserInfo);

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

@@ -8,11 +8,7 @@ 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.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
 import com.ydtech.modules.order.entity.bo.InsOrdersBo;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
-import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import lombok.*;
 
 import java.io.Serializable;

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

@@ -1,16 +1,13 @@
 package com.ydtech.modules.order.entity.bo;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.ins.model.InsOrder;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
@@ -283,16 +280,16 @@ public class InsOrdersBo {
 
     /**
      * SyscarUserInfo 转换 CustomerInfoVo
-     * @param sysCarUserInfo
+     * @param insOrdersCarUserInfo
      */
-    private CustomerInfoVo sysCarUserInfoToCustomerInfoVo(SysCarUserInfo sysCarUserInfo){
+    private CustomerInfoVo sysCarUserInfoToCustomerInfoVo(InsOrdersCarUserInfo insOrdersCarUserInfo){
         CustomerInfoVo customerInfoVo = new CustomerInfoVo();
-        BeanUtils.copyProperties(sysCarUserInfo,customerInfoVo);
+        BeanUtils.copyProperties(insOrdersCarUserInfo,customerInfoVo);
         return customerInfoVo;
     }
 
     //设置车主信息
-    public void setCarUserInfo(InsOrders insOrders, List<SysCarUserInfo> carUserInfoList) {
+    public void setCarUserInfo(InsOrders insOrders, List<InsOrdersCarUserInfo> carUserInfoList) {
         carUserInfoList.forEach(carUserInfo -> {
             if (carUserInfo.getId().equals(insOrders.getApplyId())) {
                 this.setApplyinfo(sysCarUserInfoToCustomerInfoVo(carUserInfo));
@@ -307,9 +304,9 @@ public class InsOrdersBo {
     }
 
     //设置车辆信息
-    public void setCarAllInfo(SysCarInfo sysCarInfo){
+    public void setCarAllInfo(InsOrdersCarInfo insOrdersCarInfo){
         CarInfoVo carInfoVo = new CarInfoVo();
-        BeanUtils.copyProperties(sysCarInfo,carInfoVo);
+        BeanUtils.copyProperties(insOrdersCarInfo,carInfoVo);
         this.setCarinfo(carInfoVo);
     }
 

src/main/java/com/ydtech/modules/admin/model/po/SysCarInfo.java → src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarInfo.java

@@ -1,25 +1,19 @@
-package com.ydtech.modules.admin.model.po;
+package com.ydtech.modules.order.entity.po;
 
 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.CustomerInfoVo;
-import com.ydtech.modules.order.entity.InsOrders;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 /**
 *@author: tz
 *@description: 车主用户信息
 *@create: 2024年3月7日15:57:03
 */
-@TableName(value = "sys_car_info")
+@TableName(value = "ins_orders_car_info")
 @Data
-public class SysCarInfo implements Serializable {
+public class InsOrdersCarInfo implements Serializable {
 
     /**
      * 主键

src/main/java/com/ydtech/modules/admin/model/po/SysCarUserInfo.java → src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarUserInfo.java

@@ -1,29 +1,20 @@
-package com.ydtech.modules.admin.model.po;
+package com.ydtech.modules.order.entity.po;
 
-import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.order.entity.InsOrders;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
 *@author: tz
 *@description: 车主用户信息
 *@create: 2024年3月7日15:57:03
 */
-@TableName(value = "sys_car_user_info")
+@TableName(value = "ins_orders_car_user_info")
 @Data
-public class SysCarUserInfo implements Serializable {
+public class InsOrdersCarUserInfo implements Serializable {
 
 
     //id

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

@@ -1,8 +1,6 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 

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

@@ -0,0 +1,21 @@
+package com.ydtech.modules.order.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+
+public interface InsOrdersCarInfoService extends IService<InsOrdersCarInfo> {
+
+    /**
+     * 是否存在车辆信息
+     * @param idCard 身份证号
+     * @return
+     */
+    boolean isExist(String idCard);
+
+    InsOrdersCarInfo getCarInfoByFrameNo(String frameNo);
+
+}
+
+
+

src/main/java/com/ydtech/modules/admin/service/SysCarUserInfoService.java → src/main/java/com/ydtech/modules/order/service/InsOrdersCarUserInfoService.java

@@ -1,11 +1,10 @@
-package com.ydtech.modules.admin.service;
+package com.ydtech.modules.order.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.model.SysUserInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 
-public interface SysCarUserInfoService extends IService<SysCarUserInfo> {
+public interface InsOrdersCarUserInfoService extends IService<InsOrdersCarUserInfo> {
 
     /**
      * 是否存在车主用户信息
@@ -19,7 +18,7 @@ public interface SysCarUserInfoService extends IService<SysCarUserInfo> {
      * @param idCard
      * @return
      */
-    SysCarUserInfo getCarUserInfoByIdCard(String idCard);
+    InsOrdersCarUserInfo getCarUserInfoByIdCard(String idCard);
 }
 
 

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

@@ -1,17 +1,15 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.alibaba.fastjson.JSONArray;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.FileComponents;
@@ -72,10 +70,10 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
     private final FileComponents fileComponents;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Override
     public HttpResult<List<NonAutomotiveProductsResponse.DataDTO.ProductsDTO>> productQuery(ProductQueryVo productQueryVo) throws Exception {
@@ -246,8 +244,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
     public HttpResult<CrawlerPolicyPrintVo> getPolicyPrint(String subOrderNo) throws Exception {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
         InsOrders insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
-        insOrders.setApplyinfo(sysCarUserInfoService.getById(insOrders.getApplyId()));
-        SysCarUserInfo customerInfoVo = insOrders.getApplyinfo();
+        insOrders.setApplyinfo(insOrdersCarUserInfoService.getById(insOrders.getApplyId()));
+        InsOrdersCarUserInfo customerInfoVo = insOrders.getApplyinfo();
 
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());

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

@@ -8,12 +8,11 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
@@ -45,7 +44,6 @@ import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.baidu.FileUtil;
 import com.ydtech.utils.idgen.IdGenerate;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -369,10 +367,10 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
     }
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     public HttpResult<QuoteRespVo> responseOrder(ODR1009Response odr1009Response, QuoteRespVo quoteRespVo,
                                                  PtlAgreementAttribution ptlAgreementAttribution, String orderId,
@@ -831,7 +829,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             DaJiaConfigureParameters daJiaConfigureParameters = new DaJiaConfigureParameters();
             configureParametersComponents.toEntity(daJiaConfigureParameters, insAreaCompany.getAgreementId());
             // 被保人信息
-            SysCarUserInfo customerInfoVo = insOrders.getInsureinfo();
+            InsOrdersCarUserInfo customerInfoVo = insOrders.getInsureinfo();
 //            CustomerInfoVo customerInfoVo = ownerInfo.toJavaObject(CustomerInfoVo.class);
             String identifyNo = customerInfoVo.getIdentifyNumber();
             //交强险

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

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsurKindGuoRen;
@@ -11,10 +10,8 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
@@ -53,7 +50,6 @@ import com.ydtech.utils.HttpUtil;
 import com.ydtech.utils.InsUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.Part;
@@ -120,10 +116,10 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     private final PtlAgreementAttributionService ptlAgreementAttributionService;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     /**
      * 获取渠道信息

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

@@ -2,15 +2,13 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
@@ -92,10 +90,10 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     private String apiUrl;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Override
     public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<AccidentalDrivingVo> zmQuoteVo) {
@@ -285,8 +283,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
 
-        SysCarUserInfo ownerinfo = insOrders.getOwnerinfo();
-        SysCarUserInfo applyinfo = insOrders.getApplyinfo();
+        InsOrdersCarUserInfo ownerinfo = insOrders.getOwnerinfo();
+        InsOrdersCarUserInfo applyinfo = insOrders.getApplyinfo();
 
         List<String> collect =
                 insAreaCompany.getRiskinfo().toJavaList(RiskInfoVo.class).stream().map(RiskInfoVo::getRiskCode).collect(Collectors.toList());

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

@@ -3,18 +3,16 @@ package com.ydtech.modules.order.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
 import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.service.*;
 import com.ydtech.utils.idgen.IdGenerate;
-import org.apache.poi.hssf.record.DVALRecord;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -23,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -57,10 +54,10 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     private InsAreaCompanyCarUserInfoService insAreaCompanyCarUserInfoService;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService) {
         this.insOrdersService = insOrdersService;
@@ -95,9 +92,9 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         InsOrders insOrder = insOrdersService.getById(insAreaCompany.getOrderno());
         //车辆信息
         String carInfoId = insOrder.getCarInfoId();
-        SysCarInfo sysCarInfo = sysCarInfoService.getById(carInfoId);
-        sysCarInfo.setId(IdGenerate.nextId());
-        insAreaCompany.setCarInfoId(sysCarInfo.getId());
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(carInfoId);
+        insOrdersCarInfo.setId(IdGenerate.nextId());
+        insAreaCompany.setCarInfoId(insOrdersCarInfo.getId());
 
         //投保人 被保人 车主信息
         List<String> userIds = new ArrayList<>();
@@ -106,9 +103,9 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         userIds.add(insOrder.getApplyId());
         List<String> uniqueUserIds = userIds.stream().distinct().collect(Collectors.toList());
 
-        List<SysCarUserInfo> sysCarUserInfos = sysCarUserInfoService.list(new LambdaQueryWrapper<>(new SysCarUserInfo()).in(SysCarUserInfo::getId, uniqueUserIds));
+        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.list(new LambdaQueryWrapper<>(new InsOrdersCarUserInfo()).in(InsOrdersCarUserInfo::getId, uniqueUserIds));
 
-        sysCarUserInfos.forEach(item -> {
+        insOrdersCarUserInfos.forEach(item -> {
             String id = item.getId();
             //车主信息
             if(id.equals(insOrder.getOwnerId())){
@@ -127,28 +124,28 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
         //保存车辆信息
         InsAreaCompanyCarInfo insAreaCompanyCarInfo = new InsAreaCompanyCarInfo();
-        BeanUtils.copyProperties(sysCarInfo,insAreaCompanyCarInfo);
+        BeanUtils.copyProperties(insOrdersCarInfo,insAreaCompanyCarInfo);
         insAreaCompanyCarInfoService.save(insAreaCompanyCarInfo);
 
 
         //保存用户信息
-        for(int i=0;i<sysCarUserInfos.size();i++){
+        for(int i = 0; i< insOrdersCarUserInfos.size(); i++){
             String ownerId = insAreaCompany.getOwnerId();
             String applyId = insAreaCompany.getApplyId();
             String insureId = insAreaCompany.getInsureId();
             String newId = IdGenerate.nextId();
-            if(sysCarUserInfos.get(i).getId().equals(ownerId)){
+            if(insOrdersCarUserInfos.get(i).getId().equals(ownerId)){
                 insAreaCompany.setOwnerId(newId);
             }
-            if(sysCarUserInfos.get(i).getId().equals(applyId)){
+            if(insOrdersCarUserInfos.get(i).getId().equals(applyId)){
                 insAreaCompany.setApplyId(newId);
             }
-            if(sysCarUserInfos.get(i).getId().equals(insureId)){
+            if(insOrdersCarUserInfos.get(i).getId().equals(insureId)){
                 insAreaCompany.setInsureId(newId);
             }
-            sysCarUserInfos.get(i).setId(newId);
+            insOrdersCarUserInfos.get(i).setId(newId);
         }
-        sysCarUserInfos.forEach(sysCarUserInfo -> {
+        insOrdersCarUserInfos.forEach(sysCarUserInfo -> {
             InsAreaCompanyCarUserInfo insAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
             BeanUtils.copyProperties(sysCarUserInfo,insAreaCompanyCarUserInfo);
             insAreaCompanyCarUserInfoService.save(insAreaCompanyCarUserInfo);

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

@@ -1,15 +1,12 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
@@ -39,7 +36,6 @@ import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,10 +84,10 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     private String apiUrl;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Override
     public void isLogin(PtlAgreementAttributionDto attribution, String companyId, String insCompanyName) {

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

@@ -0,0 +1,48 @@
+package com.ydtech.modules.order.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.dao.InsOrdersCarInfoMapper;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+
+@Service
+public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMapper, InsOrdersCarInfo>
+        implements InsOrdersCarInfoService {
+
+    /**
+     * 是否存在车主用户信息
+     * @param licenseNo 身份证号
+     * @return
+     */
+    public boolean isExist(String licenseNo){
+        LambdaQueryWrapper<InsOrdersCarInfo> eq = new LambdaQueryWrapper<InsOrdersCarInfo>().eq(InsOrdersCarInfo::getLicenseNo, licenseNo);
+        InsOrdersCarInfo insOrdersCarInfo = baseMapper.selectOne(eq);
+        if(!Objects.isNull(insOrdersCarInfo))
+            return true;
+        return false;
+    }
+
+    /**
+     * 根据车牌号查询车辆信息
+     * @param frameNo
+     * @return
+     */
+    @Override
+    public InsOrdersCarInfo getCarInfoByFrameNo(String frameNo) {
+        LambdaQueryWrapper<InsOrdersCarInfo> eq = new LambdaQueryWrapper<InsOrdersCarInfo>().eq(InsOrdersCarInfo::getFrameNo, frameNo);
+        return baseMapper.selectOne(eq);
+    }
+}
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,46 @@
+package com.ydtech.modules.order.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.dao.InsOrdersCarUserInfoMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+
+@Service
+public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUserInfoMapper, InsOrdersCarUserInfo>
+        implements InsOrdersCarUserInfoService {
+
+    /**
+     * 是否存在车主用户信息
+     * @param idCard 身份证号
+     * @return
+     */
+    public boolean isExist(String idCard){
+        InsOrdersCarUserInfo insOrdersCarUserInfo = baseMapper.selectOne(new LambdaQueryWrapper<InsOrdersCarUserInfo>()
+                .eq(InsOrdersCarUserInfo::getIdentifyNumber, idCard));
+        return !Objects.isNull(insOrdersCarUserInfo);
+    }
+
+    /**
+     * 根据身份证查找车主用户信息
+     * @param idCard
+     * @return
+     */
+    @Override
+    public InsOrdersCarUserInfo getCarUserInfoByIdCard(String idCard) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<InsOrdersCarUserInfo>()
+                .eq(InsOrdersCarUserInfo::getIdentifyNumber, idCard));
+    }
+}
+
+
+
+
+
+
+
+

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

@@ -1,66 +1,20 @@
 package com.ydtech.modules.order.service.impl;
 
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.stp.StpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.constants.InsuranceEnum;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse;
-import com.ydtech.constants.sys.SystemConstant;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.constants.RoleConstants;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.SysUserRole;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.fee.service.impl.FeeRuleSchemeServiceImpl;
-import com.ydtech.modules.fnc.entity.InsFeeAudit;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
-import com.ydtech.modules.ins.model.InsOrdersExcel;
-import com.ydtech.modules.ins.model.InsOrdersExcelVo;
-import com.ydtech.modules.ins.model.vo.*;
-import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
-import com.ydtech.modules.ins.model.ya.ResponseDataC2;
-import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import com.ydtech.modules.order.convert.CarModelDTOConvert;
-import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
-import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.dao.InsOrdersOldMapper;
 import com.ydtech.modules.order.entity.*;
-import com.ydtech.modules.order.entity.bo.InsOrdersBo;
-import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.po.*;
-import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.entity.vo.*;
-import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.service.*;
-import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import javax.validation.constraints.NotBlank;
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author wenkaisen
@@ -85,9 +39,9 @@ public class InsOrdersOldServiceImpl extends ServiceImpl<InsOrdersOldMapper, Ins
     private final InsOrdersTrackService insOrdersTrackService;
 
     @Autowired
-    SysCarUserInfoService sysCarUserInfoService;
+    InsOrdersCarUserInfoService insOrdersCarUserInfoService;
     @Autowired
-    SysCarInfoService sysCarInfoService;
+    InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Value("${upload.file.path}")
     private String uploadFilePath;

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

@@ -17,10 +17,10 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.RoleConstants;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.fee.service.impl.FeeRuleSchemeServiceImpl;
@@ -59,9 +59,6 @@ import org.springframework.util.ObjectUtils;
 
 import javax.validation.constraints.NotBlank;
 import java.io.File;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -88,10 +85,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private final InsOrdersTrackService insOrdersTrackService;
 
     @Autowired
-    SysCarUserInfoService sysCarUserInfoService;
+    InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Autowired
-    SysCarInfoService sysCarInfoService;
+    InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
     InsAreaCompanyRiskService insAreaCompanyRiskService;
@@ -183,11 +180,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
         wrapper.eq(InsOrders::getFrameno, vin).eq(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()).orderByAsc(InsOrders::getCreatetime).last("limit 1");
-        SysCarInfo sysCarInfo = sysCarInfoService.query().eq("frame_no", vin).one();
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.query().eq("frame_no", vin).one();
 //        InsOrders insOrders = baseMapper.selectOne(wrapper);
-        if (!ObjectUtils.isEmpty(sysCarInfo)) {
+        if (!ObjectUtils.isEmpty(insOrdersCarInfo)) {
             CarInfoVo carInfoVo = new CarInfoVo();
-            BeanUtils.copyProperties(sysCarInfo,carInfoVo);
+            BeanUtils.copyProperties(insOrdersCarInfo,carInfoVo);
 //            CarInfoVo carInfoVo = JSON.parseObject(carinfo.toJSONString(), CarInfoVo.class);
             CarModelDTO carModelDTO = CarModelDTOConvert.INSTANCE.CarInfoVotoCarModelDTO(carInfoVo);
             return Collections.singletonList(carModelDTO);
@@ -532,13 +529,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         BeanUtils.copyProperties(insOrders, insOrdersEditingVo);
 
         //获取车辆信息
-        SysCarInfo sysCarInfo = sysCarInfoService.getById(insOrders.getCarInfoId());
-        insOrdersEditingVo.setCarinfo(sysCarInfo);
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(insOrders.getCarInfoId());
+        insOrdersEditingVo.setCarinfo(insOrdersCarInfo);
         //获取车主信息
-        SysCarUserInfo ownerInfo = new SysCarUserInfo();
-        SysCarUserInfo applyInfo = new SysCarUserInfo();
-        SysCarUserInfo insureInfo = new SysCarUserInfo();
-        ownerInfo = sysCarUserInfoService.getById(insOrders.getOwnerId());
+        InsOrdersCarUserInfo ownerInfo = new InsOrdersCarUserInfo();
+        InsOrdersCarUserInfo applyInfo = new InsOrdersCarUserInfo();
+        InsOrdersCarUserInfo insureInfo = new InsOrdersCarUserInfo();
+        ownerInfo = insOrdersCarUserInfoService.getById(insOrders.getOwnerId());
         ownerInfo.setGender(ownerInfo.getGender().equals("1") ? "男" : "女");
         ownerInfo.setIdentifyValidDate(ownerInfo.getIdentifyValidDate().substring(0,10));
         ownerInfo.setIdentifyValidEndDate(ownerInfo.getIdentifyValidEndDate().substring(0,10));
@@ -551,7 +548,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersEditingVo.setApplyinfo(applyInfo);
         }else{
             //获取投保人信息
-            applyInfo = sysCarUserInfoService.getById(insOrders.getApplyId());
+            applyInfo = insOrdersCarUserInfoService.getById(insOrders.getApplyId());
             applyInfo.setGender(applyInfo.getGender().equals("1") ? "男" : "女");
             applyInfo.setIdentifyValidDate(ownerInfo.getIdentifyValidDate().substring(0,10));
             applyInfo.setIdentifyValidEndDate(ownerInfo.getIdentifyValidEndDate().substring(0,10));
@@ -569,7 +566,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersEditingVo.getInsureinfo().setOwner(true);
         }else{
             //获取被保人信息
-            insureInfo = sysCarUserInfoService.getById(insOrders.getInsureId());
+            insureInfo = insOrdersCarUserInfoService.getById(insOrders.getInsureId());
             insureInfo.setGender(insureInfo.getGender().equals("1") ? "男" : "女");
             insureInfo.setIdentifyValidDate(ownerInfo.getIdentifyValidDate().substring(0,10));
             insureInfo.setIdentifyValidEndDate(ownerInfo.getIdentifyValidEndDate().substring(0,10));
@@ -644,45 +641,45 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //先查找车主信息
         CarInfoVo carinfo = insOrdersBo.getCarinfo();
         //是否存在车主信息
-        SysCarInfo sysCarInfo = sysCarInfoService.getCarInfoByFrameNo(carinfo.getFrameNo());
-        if(Objects.isNull(sysCarInfo)){
-            BeanUtils.copyProperties(carinfo,sysCarInfo);
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByFrameNo(carinfo.getFrameNo());
+        if(Objects.isNull(insOrdersCarInfo)){
+            BeanUtils.copyProperties(carinfo, insOrdersCarInfo);
             insOrders.setCarInfoId(IdGenerate.nextId());
-            sysCarInfoService.save(sysCarInfo);
+            insOrdersCarInfoService.save(insOrdersCarInfo);
         }else{
-            insOrders.setCarInfoId(sysCarInfo.getId());
-            sysCarInfoService.updateById(sysCarInfo);
+            insOrders.setCarInfoId(insOrdersCarInfo.getId());
+            insOrdersCarInfoService.updateById(insOrdersCarInfo);
         }
 
         //更新车主信息
         CustomerInfoVo ownerinfo = insOrdersBo.getOwnerinfo();
-        SysCarUserInfo ownerUserInfo = sysCarUserInfoService.getCarUserInfoByIdCard(ownerinfo.getIdentifyNumber());
+        InsOrdersCarUserInfo ownerUserInfo = insOrdersCarUserInfoService.getCarUserInfoByIdCard(ownerinfo.getIdentifyNumber());
         //如果车主信息不存在 添加一条
         if(Objects.isNull(ownerUserInfo)) {
             BeanUtils.copyProperties(ownerinfo, ownerUserInfo);
             ownerUserInfo.setId(IdGenerate.nextId());
             insOrders.setOwnerId(ownerUserInfo.getId());
-            sysCarUserInfoService.save(ownerUserInfo);
+            insOrdersCarUserInfoService.save(ownerUserInfo);
         }else{
             insOrders.setOwnerId(ownerUserInfo.getId());
-            sysCarUserInfoService.updateById(ownerUserInfo);
+            insOrdersCarUserInfoService.updateById(ownerUserInfo);
         }
 
         //投保人信息和车主是否一致
         CustomerInfoVo applyinfo = insOrdersBo.getApplyinfo();
-        SysCarUserInfo applyUserInfo;
+        InsOrdersCarUserInfo applyUserInfo;
         if(!applyinfo.isOwner()){
             //查询投保人信息
-            applyUserInfo = sysCarUserInfoService.getCarUserInfoByIdCard(applyinfo.getIdentifyNumber());
+            applyUserInfo = insOrdersCarUserInfoService.getCarUserInfoByIdCard(applyinfo.getIdentifyNumber());
             //投保人信息是否存在
             if(Objects.isNull(applyUserInfo)){
                 BeanUtils.copyProperties(applyinfo, applyUserInfo);
                 applyUserInfo.setId(IdGenerate.nextId());
                 insOrders.setApplyId(applyUserInfo.getId());
-                sysCarUserInfoService.save(applyUserInfo);
+                insOrdersCarUserInfoService.save(applyUserInfo);
             }else{
                 insOrders.setApplyId(applyUserInfo.getId());
-                sysCarUserInfoService.updateById(applyUserInfo);
+                insOrdersCarUserInfoService.updateById(applyUserInfo);
             }
         }else{
             insOrders.setApplyId(ownerUserInfo.getId());
@@ -700,16 +697,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
         }else{
             //查询被保人信息
-            SysCarUserInfo insureUserInfo = sysCarUserInfoService.getCarUserInfoByIdCard(insureInfo.getIdentifyNumber());
+            InsOrdersCarUserInfo insureUserInfo = insOrdersCarUserInfoService.getCarUserInfoByIdCard(insureInfo.getIdentifyNumber());
             //被保人信息是否存在
             if(Objects.isNull(insureUserInfo)){
                 BeanUtils.copyProperties(insureInfo, insureUserInfo);
                 insureUserInfo.setId(IdGenerate.nextId());
                 insOrders.setInsureId(insureUserInfo.getId());
-                sysCarUserInfoService.save(insureUserInfo);
+                insOrdersCarUserInfoService.save(insureUserInfo);
             }else{
                 insOrders.setInsureId(insureUserInfo.getId());
-                sysCarUserInfoService.updateById(insureUserInfo);
+                insOrdersCarUserInfoService.updateById(insureUserInfo);
             }
         }
 
@@ -762,12 +759,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .distinct()
                 .collect(Collectors.toList());
 
-        List<SysCarUserInfo> sysCarUserInfos = sysCarUserInfoService.listByIds(uniqueList);
+        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.listByIds(uniqueList);
         //设置车主信息
-        insOrdersBo.setCarUserInfo(insOrders,sysCarUserInfos);
+        insOrdersBo.setCarUserInfo(insOrders, insOrdersCarUserInfos);
         //获取车辆信息
-        SysCarInfo sysCarInfo = sysCarInfoService.getById(insOrders.getCarInfoId());
-        insOrdersBo.setCarAllInfo(sysCarInfo);
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(insOrders.getCarInfoId());
+        insOrdersBo.setCarAllInfo(insOrdersCarInfo);
         return insOrdersBo;
 
     }
@@ -793,16 +790,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         final String orderNo = insOrders.getOrderno();
         // 1 车辆信息
         // 是否存在车辆信息
-        if(!sysCarInfoService.isExist(insOrdersBo.getCarinfo().getLicenseNo())){
+        if(!insOrdersCarInfoService.isExist(insOrdersBo.getCarinfo().getLicenseNo())){
             CarInfoVo carinfo = insOrdersBo.getCarinfo();
-            SysCarInfo sysCarInfo = new SysCarInfo();
-            BeanUtils.copyProperties(carinfo, sysCarInfo);
-            sysCarInfo.setId(IdGenerate.nextId());
-            sysCarInfoService.save(sysCarInfo);
-            insOrders.setCarInfoId(sysCarInfo.getId());
+            InsOrdersCarInfo insOrdersCarInfo = new InsOrdersCarInfo();
+            BeanUtils.copyProperties(carinfo, insOrdersCarInfo);
+            insOrdersCarInfo.setId(IdGenerate.nextId());
+            insOrdersCarInfoService.save(insOrdersCarInfo);
+            insOrders.setCarInfoId(insOrdersCarInfo.getId());
         }else{
-            SysCarInfo sysCarInfo = sysCarInfoService.getCarInfoByFrameNo(insOrdersBo.getCarinfo().getFrameNo());
-            insOrders.setCarInfoId(sysCarInfo.getId());
+            InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByFrameNo(insOrdersBo.getCarinfo().getFrameNo());
+            insOrders.setCarInfoId(insOrdersCarInfo.getId());
         }
 
         // 2 人员信息
@@ -810,31 +807,31 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 车主信息
         CustomerInfoVo ownerInfo = insOrdersBo.getOwnerinfo();
         //检查是否存在车主信息
-        if(sysCarUserInfoService.isExist(ownerInfo.getIdentifyNumber())){
-            SysCarUserInfo carUserInfoByIdCard = sysCarUserInfoService.getCarUserInfoByIdCard(ownerInfo.getIdentifyNumber());
+        if(insOrdersCarUserInfoService.isExist(ownerInfo.getIdentifyNumber())){
+            InsOrdersCarUserInfo carUserInfoByIdCard = insOrdersCarUserInfoService.getCarUserInfoByIdCard(ownerInfo.getIdentifyNumber());
             insOrders.setOwnerId(carUserInfoByIdCard.getId());
         }else{
             //保存车主信息
-            SysCarUserInfo sysCarUserInfo = new SysCarUserInfo();
-            BeanUtils.copyProperties(ownerInfo, sysCarUserInfo);
-            sysCarUserInfo.setId(IdGenerate.nextId());
-            sysCarUserInfoService.save(sysCarUserInfo);
-            insOrders.setOwnerId(sysCarUserInfo.getId());
+            InsOrdersCarUserInfo insOrdersCarUserInfo = new InsOrdersCarUserInfo();
+            BeanUtils.copyProperties(ownerInfo, insOrdersCarUserInfo);
+            insOrdersCarUserInfo.setId(IdGenerate.nextId());
+            insOrdersCarUserInfoService.save(insOrdersCarUserInfo);
+            insOrders.setOwnerId(insOrdersCarUserInfo.getId());
         }
         // 投保人信息
         CustomerInfoVo applyInfo = insOrdersBo.getApplyinfo();
         if(!applyInfo.isOwner()){
             //检查是否存在投保人信息
-            if(sysCarUserInfoService.isExist(applyInfo.getIdentifyNumber())){
-                SysCarUserInfo carUserInfoByIdCard = sysCarUserInfoService.getCarUserInfoByIdCard(applyInfo.getIdentifyNumber());
+            if(insOrdersCarUserInfoService.isExist(applyInfo.getIdentifyNumber())){
+                InsOrdersCarUserInfo carUserInfoByIdCard = insOrdersCarUserInfoService.getCarUserInfoByIdCard(applyInfo.getIdentifyNumber());
                 insOrders.setApplyId(carUserInfoByIdCard.getId());
             }else{
                 //保存投保人信息
-                SysCarUserInfo sysCarUserInfo = new SysCarUserInfo();
-                BeanUtils.copyProperties(applyInfo, sysCarUserInfo);
-                sysCarUserInfo.setId(IdGenerate.nextId());
-                sysCarUserInfoService.save(sysCarUserInfo);
-                insOrders.setApplyId(sysCarUserInfo.getId());
+                InsOrdersCarUserInfo insOrdersCarUserInfo = new InsOrdersCarUserInfo();
+                BeanUtils.copyProperties(applyInfo, insOrdersCarUserInfo);
+                insOrdersCarUserInfo.setId(IdGenerate.nextId());
+                insOrdersCarUserInfoService.save(insOrdersCarUserInfo);
+                insOrders.setApplyId(insOrdersCarUserInfo.getId());
             }
         }else{
             insOrders.setApplyId(insOrders.getOwnerId());
@@ -843,16 +840,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         CustomerInfoVo insureInfo = insOrdersBo.getInsureinfo();
         if(!insureInfo.isOwner() && !insureInfo.isInsuranceHolder()){
             //检查是否存在被保人信息
-            if(sysCarUserInfoService.isExist(insureInfo.getIdentifyNumber())){
-                SysCarUserInfo carUserInfoByIdCard = sysCarUserInfoService.getCarUserInfoByIdCard(insureInfo.getIdentifyNumber());
+            if(insOrdersCarUserInfoService.isExist(insureInfo.getIdentifyNumber())){
+                InsOrdersCarUserInfo carUserInfoByIdCard = insOrdersCarUserInfoService.getCarUserInfoByIdCard(insureInfo.getIdentifyNumber());
                 insOrders.setInsureId(carUserInfoByIdCard.getId());
             }else{
                 //保存被保人信息
-                SysCarUserInfo sysCarUserInfo = new SysCarUserInfo();
-                BeanUtils.copyProperties(insureInfo, sysCarUserInfo);
-                sysCarUserInfo.setId(IdGenerate.nextId());
-                sysCarUserInfoService.save(sysCarUserInfo);
-                insOrders.setInsureId(sysCarUserInfo.getId());
+                InsOrdersCarUserInfo insOrdersCarUserInfo = new InsOrdersCarUserInfo();
+                BeanUtils.copyProperties(insureInfo, insOrdersCarUserInfo);
+                insOrdersCarUserInfo.setId(IdGenerate.nextId());
+                insOrdersCarUserInfoService.save(insOrdersCarUserInfo);
+                insOrders.setInsureId(insOrdersCarUserInfo.getId());
             }
         }else{
             insOrders.setInsureId(insOrders.getOwnerId());

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
@@ -10,10 +9,9 @@ import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
@@ -38,7 +36,6 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.HMAC256Uitil;
 import com.ydtech.utils.HttpXmlUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +47,6 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -98,10 +94,10 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
 
 //    @Override
@@ -373,7 +369,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         try {
             //1.组装RequestBody
             ResponseDataC2 responseDataC2 = JSON.parseObject(insAreaCompany.getReptxt().toJSONString(), ResponseDataC2.class);
-            SysCarUserInfo insureinfo = orders.getInsureinfo();
+            InsOrdersCarUserInfo insureinfo = orders.getInsureinfo();
 
             requestBodyC3.setQuotationNoCI(responseDataC2.getResponseBody().getQuotationNoCI());
             requestBodyC3.setQuotationNoBI(responseDataC2.getResponseBody().getQuotationNoBI());
@@ -563,10 +559,10 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             requestBodyB7.setCityCode("140400");
             List<PrivyDTO> privy = new ArrayList<>();//关系人信息
 
-            SysCarUserInfo policyHolderInfo = insOrders.getApplyinfo();
+            InsOrdersCarUserInfo policyHolderInfo = insOrders.getApplyinfo();
             PrivyDTO privyDTO = new PrivyDTO("1000", policyHolderInfo.getName(), policyHolderInfo.getIdentifyNumber());
             privyDTO.setPhoneNo(policyHolderInfo.getMobile());
-            SysCarUserInfo insuredPersonInfo = insOrders.getInsureinfo();
+            InsOrdersCarUserInfo insuredPersonInfo = insOrders.getInsureinfo();
             PrivyDTO privyDTO2 = new PrivyDTO("0100", insuredPersonInfo.getName(), insuredPersonInfo.getIdentifyNumber());
             privyDTO2.setPhoneNo(insuredPersonInfo.getMobile());
             privy.add(privyDTO);

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.ydtech.config.properties.YongchengApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
@@ -15,12 +14,10 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.WhetherEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.esm.dao.EsmInsAttachInsureDetailsMapper;
 import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
 import com.ydtech.modules.esm.model.EsmInsAttachInsure;
@@ -79,7 +76,6 @@ import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -147,10 +143,10 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     public void gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo, CoreModelsVo coreModelsVo) {
         CarModel_Req carModelReq = new CarModel_Req();

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

@@ -2,17 +2,14 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.components.ZhongmeiRequestComponents;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.request.Response;
 import com.ydtech.modules.ins.model.vo.*;
@@ -52,7 +49,6 @@ import com.ydtech.modules.protocol.service.PtlAgreementNonCarProductCostsService
 import com.ydtech.modules.protocol.service.PtlNonCarProductSchemeService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.baidu.FileUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -116,10 +112,10 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
     private String apiUrl;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     private void modelInquiry(String modelName, List<ModelsQueryResponse.SimpleStadarCarDTO> simpleStadarCarDTOS) {
         if (!simpleStadarCarDTOS.isEmpty()) {
@@ -243,7 +239,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
                 insAreaCompany.getAgreementId());
 
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
-        SysCarUserInfo customerInfoVo = insOrders.getApplyinfo();
+        InsOrdersCarUserInfo customerInfoVo = insOrders.getApplyinfo();
         // 2. 提交核保
         SubmitResponse response = submitForUnderwriting(insAreaCompany.getId(), insOrders.getFrameno(), customerInfoVo,
                 zmConfigureParameters);
@@ -473,7 +469,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
      * @param zmConfigureParameters 中煤配置参数
      * @return 核保请求参数
      */
-    public SubmitResponse submitForUnderwriting(String orderNo, String frameNo, SysCarUserInfo customerInfoVo,
+    public SubmitResponse submitForUnderwriting(String orderNo, String frameNo, InsOrdersCarUserInfo customerInfoVo,
                                                 ZmConfigureParameters zmConfigureParameters) {
         SubmitRequest submitRequest = new SubmitRequest();
         submitRequest.setBusinessNo(orderNo);

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

@@ -1,16 +1,13 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.components.ZhongmeiRequestComponents;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsAttribution;
@@ -19,8 +16,6 @@ import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.EsmInsAttributionService;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.esm.service.InsTaskImageService;
-import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
-import com.ydtech.modules.fee.dto.FeeSchemeResDto;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.request.Response;
 import com.ydtech.modules.ins.model.request.ZhongmeiQuoteResponse;
@@ -31,7 +26,6 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
 import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.request.ZmRequestParameter;
@@ -54,7 +48,6 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
@@ -76,10 +69,10 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
     private final FeeRuleSchemeService feeRuleSchemeService;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     public ZhongMeiOrderServiceImpl(InsAreaCompanyService insAreaCompanyService, ZhongmeiRequestComponents zhongmeiRequestComponents, InsOrdersService insOrdersService, InsTaskImageService insTaskImageService, EsmInsAttributionService esmInsAttributionService, SysUserService sysUserService, EsmInsCompanyService esmInsCompanyService, FeeRuleSchemeService feeRuleSchemeService) {
         this.insAreaCompanyService = insAreaCompanyService;

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

@@ -2,17 +2,14 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
@@ -47,7 +44,6 @@ import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,10 +92,10 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     private String apiUrl;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Override
     public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
@@ -312,7 +308,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 车牌号
         String licensePlate = insOrders.getLicenseno();
         // 被保人信息
-        SysCarUserInfo customerInfoVo = insOrders.getInsureinfo();
+        InsOrdersCarUserInfo customerInfoVo = insOrders.getInsureinfo();
 //        CustomerInfoVo customerInfoVo = ownerInfo.toJavaObject(CustomerInfoVo.class);
         String busNo;
         BusType busType;

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

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -17,7 +17,6 @@ import com.ydtech.modules.order.entity.po.InsOrdersKind;
 import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import com.ydtech.modules.order.entity.po.InsOrdersTax;
 import com.ydtech.modules.order.service.*;
-import com.ydtech.utils.IDCardUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +41,9 @@ public class SyncCarInfoHandler {
     @Autowired
     private InsOrdersService insOrdersService;
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
     @Autowired
     private InsOrdersRiskService insOrdersRiskService;
     @Autowired
@@ -85,15 +84,15 @@ public class SyncCarInfoHandler {
     public void SyncCarInfoHandler() {
         int current = 1;
         //全局存储 用户信息
-        List<SysCarUserInfo> globalSysCarUserInfos = new ArrayList<>();
+        List<InsOrdersCarUserInfo> globalInsOrdersCarUserInfos = new ArrayList<>();
         while(true) {
             Page<InsOrdersOld> page = insOrdersOldService.page(new Page<>(current, 1000));
             if (page.getRecords().size() > 0) {
                 List<InsOrdersOld> list = page.getRecords();
                 List<InsOrders> insOrdersList = new ArrayList<>();
                 //需要保存的车主用户数据
-                List<SysCarUserInfo> sysCarUserInfos = new ArrayList<>();
-                List<SysCarInfo> sysCarInfos = new ArrayList<>();
+                List<InsOrdersCarUserInfo> insOrdersCarUserInfos = new ArrayList<>();
+                List<InsOrdersCarInfo> insOrdersCarInfos = new ArrayList<>();
                 List<InsOrdersRisk> insOrdersRisks = new ArrayList<>();
                 List<InsOrdersKind> insOrdersKinds = new ArrayList<>();
                 List<InsOrdersTax> insOrdersTaxes = new ArrayList<>();
@@ -104,44 +103,44 @@ public class SyncCarInfoHandler {
                     JSONObject applyinfo = insOrdersOld.getApplyinfo();
                     JSONObject insureInfo = insOrdersOld.getInsureinfo();
                     //车主信息是否存在
-                    if (globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(ownerInfo.getString("identifyNumber"))).count() > 0) {
-                        List<SysCarUserInfo> identifyNumber = globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(ownerInfo.getString("identifyNumber"))).collect(Collectors.toList());
+                    if (globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(ownerInfo.getString("identifyNumber"))).count() > 0) {
+                        List<InsOrdersCarUserInfo> identifyNumber = globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(ownerInfo.getString("identifyNumber"))).collect(Collectors.toList());
                         System.out.printf("identifyNumber" + identifyNumber);
                         String id = identifyNumber.get(0).getId();
                         insOrders.setOwnerId(id);
                         insOrders.setInsureId(id);
                         insOrders.setApplyId(id);
                     } else {
-                        SysCarUserInfo sysCarUserInfo1 = ownerInfo.toJavaObject(SysCarUserInfo.class);
-                        sysCarUserInfo1.setId(IdGenerate.nextId());
-                        sysCarUserInfos.add(sysCarUserInfo1);
-                        globalSysCarUserInfos.add(sysCarUserInfo1);
-                        sysCarUserInfo1.setIdentifyValidDate(validateAndFormatDate(sysCarUserInfo1.getIdentifyValidDate()));
-                        sysCarUserInfo1.setIdentifyValidEndDate(validateAndFormatDate(sysCarUserInfo1.getIdentifyValidEndDate()));
-                        sysCarUserInfo1.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(sysCarUserInfo1.getIdentifyNumber())));
-                        sysCarUserInfo1.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(sysCarUserInfo1.getIdentifyNumber())));
-                        insOrders.setOwnerId(sysCarUserInfo1.getId());
-                        insOrders.setInsureId(sysCarUserInfo1.getId());
-                        insOrders.setApplyId(sysCarUserInfo1.getId());
+                        InsOrdersCarUserInfo insOrdersCarUserInfo1 = ownerInfo.toJavaObject(InsOrdersCarUserInfo.class);
+                        insOrdersCarUserInfo1.setId(IdGenerate.nextId());
+                        insOrdersCarUserInfos.add(insOrdersCarUserInfo1);
+                        globalInsOrdersCarUserInfos.add(insOrdersCarUserInfo1);
+                        insOrdersCarUserInfo1.setIdentifyValidDate(validateAndFormatDate(insOrdersCarUserInfo1.getIdentifyValidDate()));
+                        insOrdersCarUserInfo1.setIdentifyValidEndDate(validateAndFormatDate(insOrdersCarUserInfo1.getIdentifyValidEndDate()));
+                        insOrdersCarUserInfo1.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insOrdersCarUserInfo1.getIdentifyNumber())));
+                        insOrdersCarUserInfo1.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insOrdersCarUserInfo1.getIdentifyNumber())));
+                        insOrders.setOwnerId(insOrdersCarUserInfo1.getId());
+                        insOrders.setInsureId(insOrdersCarUserInfo1.getId());
+                        insOrders.setApplyId(insOrdersCarUserInfo1.getId());
                     }
                     //投保人是否同车主
                     if (!applyinfo.getString("identifyNumber").equals(ownerInfo.getString("identifyNumber"))) {
                         //查看全局 用户信息是否存在
-                        long count = globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(applyinfo.getString("identifyNumber"))).count();
+                        long count = globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(applyinfo.getString("identifyNumber"))).count();
                         if(count > 0) {
-                            List<SysCarUserInfo> identifyNumber = globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(applyinfo.getString("identifyNumber"))).collect(Collectors.toList());
+                            List<InsOrdersCarUserInfo> identifyNumber = globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(applyinfo.getString("identifyNumber"))).collect(Collectors.toList());
                             System.out.printf("identifyNumber" + identifyNumber);
                             insOrders.setApplyId(identifyNumber.get(0).getId());
                         }else {
-                            SysCarUserInfo sysCarUserInfo = applyinfo.toJavaObject(SysCarUserInfo.class);
-                            sysCarUserInfo.setIdentifyValidDate(validateAndFormatDate(sysCarUserInfo.getIdentifyValidDate()));
-                            sysCarUserInfo.setIdentifyValidEndDate(validateAndFormatDate(sysCarUserInfo.getIdentifyValidEndDate()));
-                            sysCarUserInfo.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(sysCarUserInfo.getIdentifyNumber())));
-                            sysCarUserInfo.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(sysCarUserInfo.getIdentifyNumber())));
-                            sysCarUserInfo.setId(IdGenerate.nextId());
-                            sysCarUserInfos.add(sysCarUserInfo);
-                            globalSysCarUserInfos.add(sysCarUserInfo);
-                            insOrders.setApplyId(sysCarUserInfo.getId());
+                            InsOrdersCarUserInfo insOrdersCarUserInfo = applyinfo.toJavaObject(InsOrdersCarUserInfo.class);
+                            insOrdersCarUserInfo.setIdentifyValidDate(validateAndFormatDate(insOrdersCarUserInfo.getIdentifyValidDate()));
+                            insOrdersCarUserInfo.setIdentifyValidEndDate(validateAndFormatDate(insOrdersCarUserInfo.getIdentifyValidEndDate()));
+                            insOrdersCarUserInfo.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insOrdersCarUserInfo.getIdentifyNumber())));
+                            insOrdersCarUserInfo.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insOrdersCarUserInfo.getIdentifyNumber())));
+                            insOrdersCarUserInfo.setId(IdGenerate.nextId());
+                            insOrdersCarUserInfos.add(insOrdersCarUserInfo);
+                            globalInsOrdersCarUserInfos.add(insOrdersCarUserInfo);
+                            insOrders.setApplyId(insOrdersCarUserInfo.getId());
                         }
                     }
                     //被保人是否同车主
@@ -149,21 +148,21 @@ public class SyncCarInfoHandler {
                             !ownerInfo.getString("identifyNumber").equals(insureInfo.getString("identifyNumber"))) {
 
                         //查看全局 用户信息是否存在
-                        long count = globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(insureInfo.getString("identifyNumber"))).count();
+                        long count = globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(insureInfo.getString("identifyNumber"))).count();
                         if(count > 0) {
-                            List<SysCarUserInfo> identifyNumber = globalSysCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(insureInfo.getString("identifyNumber"))).collect(Collectors.toList());
+                            List<InsOrdersCarUserInfo> identifyNumber = globalInsOrdersCarUserInfos.stream().filter(x -> x.getIdentifyNumber().equals(insureInfo.getString("identifyNumber"))).collect(Collectors.toList());
                             System.out.printf("identifyNumber" + identifyNumber);
                             insOrders.setInsureId(identifyNumber.get(0).getId());
                         }else {
-                            SysCarUserInfo sysCarUserInfo = insureInfo.toJavaObject(SysCarUserInfo.class);
-                            sysCarUserInfo.setIdentifyValidDate(validateAndFormatDate(sysCarUserInfo.getIdentifyValidDate()));
-                            sysCarUserInfo.setIdentifyValidEndDate(validateAndFormatDate(sysCarUserInfo.getIdentifyValidEndDate()));
-                            sysCarUserInfo.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(sysCarUserInfo.getIdentifyNumber())));
-                            sysCarUserInfo.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(sysCarUserInfo.getIdentifyNumber())));
-                            sysCarUserInfo.setId(IdGenerate.nextId());
-                            sysCarUserInfos.add(sysCarUserInfo);
-                            globalSysCarUserInfos.add(sysCarUserInfo);
-                            insOrders.setInsureId(sysCarUserInfo.getId());
+                            InsOrdersCarUserInfo insOrdersCarUserInfo = insureInfo.toJavaObject(InsOrdersCarUserInfo.class);
+                            insOrdersCarUserInfo.setIdentifyValidDate(validateAndFormatDate(insOrdersCarUserInfo.getIdentifyValidDate()));
+                            insOrdersCarUserInfo.setIdentifyValidEndDate(validateAndFormatDate(insOrdersCarUserInfo.getIdentifyValidEndDate()));
+                            insOrdersCarUserInfo.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insOrdersCarUserInfo.getIdentifyNumber())));
+                            insOrdersCarUserInfo.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insOrdersCarUserInfo.getIdentifyNumber())));
+                            insOrdersCarUserInfo.setId(IdGenerate.nextId());
+                            insOrdersCarUserInfos.add(insOrdersCarUserInfo);
+                            globalInsOrdersCarUserInfos.add(insOrdersCarUserInfo);
+                            insOrders.setInsureId(insOrdersCarUserInfo.getId());
                         }
                     }else if(applyinfo.getString("identifyNumber").equals(insureInfo.getString("identifyNumber"))){
                         insOrders.setInsureId(insOrders.getApplyId());
@@ -173,18 +172,18 @@ public class SyncCarInfoHandler {
 
                     JSONObject carInfo = insOrdersOld.getCarinfo();
                     //车辆信息
-                    if (sysCarInfos.stream().filter(x -> x.getLicenseNo().equals(carInfo.getString("licenseNo"))).count() > 0) {
-                        List<SysCarInfo> collect = sysCarInfos.stream().filter(x -> x.getLicenseNo().equals(carInfo.getString("licenseNo"))).collect(Collectors.toList());
+                    if (insOrdersCarInfos.stream().filter(x -> x.getLicenseNo().equals(carInfo.getString("licenseNo"))).count() > 0) {
+                        List<InsOrdersCarInfo> collect = insOrdersCarInfos.stream().filter(x -> x.getLicenseNo().equals(carInfo.getString("licenseNo"))).collect(Collectors.toList());
                         System.out.printf("licenseNo" + carInfo.getString("licenseNo"));
                         String id = collect.get(0).getId();
                         insOrders.setCarInfoId(id);
                     } else {
-                        SysCarInfo sysCarInfo = carInfo.toJavaObject(SysCarInfo.class);
-                        sysCarInfo.setRegisterDate(validateAndFormatDate(sysCarInfo.getRegisterDate()));
-                        sysCarInfo.setIssueDate(validateAndFormatDate(sysCarInfo.getIssueDate()));
-                        sysCarInfo.setId(IdGenerate.nextId());
-                        sysCarInfos.add(sysCarInfo);
-                        insOrders.setCarInfoId(sysCarInfo.getId());
+                        InsOrdersCarInfo insOrdersCarInfo = carInfo.toJavaObject(InsOrdersCarInfo.class);
+                        insOrdersCarInfo.setRegisterDate(validateAndFormatDate(insOrdersCarInfo.getRegisterDate()));
+                        insOrdersCarInfo.setIssueDate(validateAndFormatDate(insOrdersCarInfo.getIssueDate()));
+                        insOrdersCarInfo.setId(IdGenerate.nextId());
+                        insOrdersCarInfos.add(insOrdersCarInfo);
+                        insOrders.setCarInfoId(insOrdersCarInfo.getId());
                     }
 
                     //risk  kind
@@ -216,20 +215,20 @@ public class SyncCarInfoHandler {
                     insOrdersList.add(insOrders);
                 });
 
-                List<SysCarUserInfo> sysCarUserInfoList = sysCarUserInfos.stream()
+                List<InsOrdersCarUserInfo> insOrdersCarUserInfoList = insOrdersCarUserInfos.stream()
                         .collect(Collectors.toMap(
-                                SysCarUserInfo::getIdentifyNumber, // 使用 licenseNo 作为 key
+                                InsOrdersCarUserInfo::getIdentifyNumber, // 使用 licenseNo 作为 key
                                 user -> user, // 直接使用用户信息作为 value
                                 (existing, replacement) -> existing // 若有重复的 licenseNo，则保留第一个出现的用户信息
                         ))
                         .values()
                         .stream()
                         .collect(Collectors.toList());
-                sysCarUserInfoService.saveBatch(sysCarUserInfoList);
+                insOrdersCarUserInfoService.saveBatch(insOrdersCarUserInfoList);
 
-                List<SysCarInfo> sysCarInfoList = sysCarInfos.stream()
+                List<InsOrdersCarInfo> insOrdersCarInfoList = insOrdersCarInfos.stream()
                         .collect(Collectors.toMap(
-                                SysCarInfo::getLicenseNo, // 使用 licenseNo 作为 key
+                                InsOrdersCarInfo::getLicenseNo, // 使用 licenseNo 作为 key
                                 user -> user, // 直接使用用户信息作为 value
                                 (existing, replacement) -> existing // 若有重复的 licenseNo，则保留第一个出现的用户信息
                         ))
@@ -237,7 +236,7 @@ public class SyncCarInfoHandler {
                         .stream()
                         .collect(Collectors.toList());
 
-                sysCarInfoService.saveBatch(sysCarInfoList);
+                insOrdersCarInfoService.saveBatch(insOrdersCarInfoList);
 
                 for (InsOrdersRisk insOrdersRisk : insOrdersRisks) {
                     insOrdersRisk.setId(IdGenerate.nextId());

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

@@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import com.ydtech.modules.admin.model.po.SysCarInfo;
-import com.ydtech.modules.admin.model.po.SysCarUserInfo;
-import com.ydtech.modules.admin.service.SysCarInfoService;
-import com.ydtech.modules.admin.service.SysCarUserInfoService;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.service.InsOrdersCarInfoService;
+import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.xxl.model.vo.InsAreaCompanyVo;
@@ -21,8 +21,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 @Component
 public class SyncInsAreaCompany {
@@ -31,10 +29,10 @@ public class SyncInsAreaCompany {
     private InsAreaCompanyOldService insAreaCompanyOldService;
 
     @Autowired
-    private SysCarInfoService sysCarInfoService;
+    private InsOrdersCarInfoService insOrdersCarInfoService;
 
     @Autowired
-    private SysCarUserInfoService sysCarUserInfoService;
+    private InsOrdersCarUserInfoService insOrdersCarUserInfoService;
 
     @Autowired
     private InsAreaCompanyCarInfoService insAreaCompanyCarInfoService;
@@ -66,9 +64,9 @@ public class SyncInsAreaCompany {
             BeanUtils.copyProperties(insAreaCompanyOld, insAreaCompany);
             //1 处理车主信息
 //                sysCarInfoService.getCarInfoByFrameNo(insAreaCompanyOld.getFrameNo());
-            SysCarInfo sysCarInfo = sysCarInfoService.getById(insAreaCompanyOld.getCarInfoId());
+            InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(insAreaCompanyOld.getCarInfoId());
             InsAreaCompanyCarInfo carInfo = new InsAreaCompanyCarInfo();
-            BeanUtils.copyProperties(sysCarInfo, carInfo);
+            BeanUtils.copyProperties(insOrdersCarInfo, carInfo);
             insAreaCompanyCarInfoService.saveOrUpdate(carInfo);
             insAreaCompany.setCarInfoId(carInfo.getId());
             insAreaCompany.setId(IdGenerate.nextId());
@@ -78,7 +76,7 @@ public class SyncInsAreaCompany {
             userIds.add(insAreaCompanyOld.getOwnerId());
             userIds.add(insAreaCompanyOld.getApplyId());
             userIds.add(insAreaCompanyOld.getInsureId());
-            List<SysCarUserInfo> userInfoList = sysCarUserInfoService.list(new LambdaQueryWrapper<>(SysCarUserInfo.class).in(SysCarUserInfo::getId, userIds));
+            List<InsOrdersCarUserInfo> userInfoList = insOrdersCarUserInfoService.list(new LambdaQueryWrapper<>(InsOrdersCarUserInfo.class).in(InsOrdersCarUserInfo::getId, userIds));
 
             List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
             userInfoList.forEach(item->{