调整bug

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

@@ -38,6 +38,12 @@ public class InsAreaCompanyCarInfo implements Serializable {
     @TableField(value="id")
     private String id;
 
+    /**
+     * 子订单id
+     */
+    @TableField(value = "company_id")
+    private String companyId;
+
     /**
      * 车架号
      */

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

@@ -25,6 +25,10 @@ public class InsAreaCompanyCarUserInfo implements Serializable {
     @TableId(value = "id")
     private String id;
 
+    //子订单id
+    @TableField(value = "company_id")
+    private String companyId;
+
     //姓名
     @TableField(value = "name")
     private String name;

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarInfo.java

@@ -25,6 +25,12 @@ public class InsOrdersCarInfo implements Serializable {
     @TableField(value="id")
     private String id;
 
+    /**
+     * 订单号
+     */
+    @TableField(value="order_no")
+    private String orderNo;
+
     /**
      * 车架号
      */

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarUserInfo.java

@@ -25,6 +25,10 @@ public class InsOrdersCarUserInfo implements Serializable {
     @TableId(value = "id")
     private String id;
 
+    //订单号
+    @TableField(value = "order_no")
+    private String orderNo;
+
     //姓名
     @TableField(value = "name")
     private String name;

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

@@ -106,56 +106,47 @@ public class SyncCarInfoHandler {
                 JSONArray risk = item.getRisk();
                 JSONArray kind = item.getKing();
                 JSONObject tax = item.getVehicleAndVesselTax();
-                //车辆信息
-                InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByFrameNo(carInfo.getString("frameNo"));
-                if (insOrdersCarInfo == null) {
-                    //新增
-                    insOrdersCarInfo = JSONObject.parseObject(carInfo.toJSONString(), InsOrdersCarInfo.class);
-                    insOrdersCarInfo.setId(IdGenerate.nextId());
-                    insOrdersCarInfo.setRegisterDate(validateAndFormatDate(insOrdersCarInfo.getRegisterDate()));
-                    insOrdersCarInfo.setIssueDate(validateAndFormatDate(insOrdersCarInfo.getIssueDate()));
-                    insOrdersCarInfoService.save(insOrdersCarInfo);
-                }
+                //新增 车辆信息
+                InsOrdersCarInfo insOrdersCarInfo = JSONObject.parseObject(carInfo.toJSONString(), InsOrdersCarInfo.class);
+                insOrdersCarInfo.setId(IdGenerate.nextId());
+                insOrdersCarInfo.setOrderNo(insOrders.getOrderno());
+                insOrdersCarInfo.setRegisterDate(validateAndFormatDate(insOrdersCarInfo.getRegisterDate()));
+                insOrdersCarInfo.setIssueDate(validateAndFormatDate(insOrdersCarInfo.getIssueDate()));
                 insOrders.setCarInfoId(insOrdersCarInfo.getId());
+                insOrdersCarInfoService.save(insOrdersCarInfo);
 
                 //车主信息
-                InsOrdersCarUserInfo owner = insOrdersCarUserInfoService.getOne(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getIdentifyNumber, ownerInfo.getString("identifyNumber")));
-                if (owner == null) {
-                    owner = JSONObject.parseObject(ownerInfo.toJSONString(), InsOrdersCarUserInfo.class);
-                    owner.setId(IdGenerate.nextId());
-                    owner.setIdentifyValidDate(validateAndFormatDate(owner.getIdentifyValidDate()));
-                    owner.setIdentifyValidEndDate(validateAndFormatDate(owner.getIdentifyValidEndDate()));
-                    owner.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(owner.getIdentifyNumber()) == 1?"男":"女"));
-                    owner.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(owner.getIdentifyNumber())));
-                    insOrdersCarUserInfoService.save(owner);
-                }
+                InsOrdersCarUserInfo owner = JSONObject.parseObject(ownerInfo.toJSONString(), InsOrdersCarUserInfo.class);
+                owner.setId(IdGenerate.nextId());
+                owner.setIdentifyValidDate(validateAndFormatDate(owner.getIdentifyValidDate()));
+                owner.setIdentifyValidEndDate(validateAndFormatDate(owner.getIdentifyValidEndDate()));
+                owner.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(owner.getIdentifyNumber()) == 1?"男":"女"));
+                owner.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(owner.getIdentifyNumber())));
+                owner.setOrderNo(insOrders.getOrderno());
                 insOrders.setOwnerId(owner.getId());
-
-                //投保人信息
-                InsOrdersCarUserInfo apply = insOrdersCarUserInfoService.getOne(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getIdentifyNumber, applyinfo.getString("identifyNumber")));
-                if (apply == null) {
-                    apply = JSONObject.parseObject(applyinfo.toJSONString(), InsOrdersCarUserInfo.class);
-                    apply.setId(IdGenerate.nextId());
-                    apply.setIdentifyValidDate(validateAndFormatDate(apply.getIdentifyValidDate()));
-                    apply.setIdentifyValidEndDate(validateAndFormatDate(apply.getIdentifyValidEndDate()));
-                    apply.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(apply.getIdentifyNumber()) == 1?"男":"女"));
-                    apply.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(apply.getIdentifyNumber())));
-                    insOrdersCarUserInfoService.save(apply);
-                }
+                insOrdersCarUserInfoService.save(owner);
+
+                //投保人
+                InsOrdersCarUserInfo apply = JSONObject.parseObject(applyinfo.toJSONString(), InsOrdersCarUserInfo.class);
+                apply.setId(IdGenerate.nextId());
+                apply.setIdentifyValidDate(validateAndFormatDate(apply.getIdentifyValidDate()));
+                apply.setIdentifyValidEndDate(validateAndFormatDate(apply.getIdentifyValidEndDate()));
+                apply.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(apply.getIdentifyNumber()) == 1?"男":"女"));
+                apply.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(apply.getIdentifyNumber())));
+                apply.setOrderNo(insOrders.getOrderno());
                 insOrders.setApplyId(apply.getId());
+                insOrdersCarUserInfoService.save(apply);
 
                 //被保人信息
-                InsOrdersCarUserInfo insure = insOrdersCarUserInfoService.getOne(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getIdentifyNumber, insureInfo.getString("identifyNumber")));
-                if (insure == null) {
-                    insure = JSONObject.parseObject(insureInfo.toJSONString(), InsOrdersCarUserInfo.class);
-                    insure.setId(IdGenerate.nextId());
-                    insure.setIdentifyValidDate(validateAndFormatDate(insure.getIdentifyValidDate()));
-                    insure.setIdentifyValidEndDate(validateAndFormatDate(insure.getIdentifyValidEndDate()));
-                    insure.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insure.getIdentifyNumber()) == 1?"男":"女"));
-                    insure.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insure.getIdentifyNumber())));
-                    insOrdersCarUserInfoService.save(insure);
-                }
+                InsOrdersCarUserInfo insure = JSONObject.parseObject(insureInfo.toJSONString(), InsOrdersCarUserInfo.class);
+                insure.setId(IdGenerate.nextId());
+                insure.setIdentifyValidDate(validateAndFormatDate(insure.getIdentifyValidDate()));
+                insure.setIdentifyValidEndDate(validateAndFormatDate(insure.getIdentifyValidEndDate()));
+                insure.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insure.getIdentifyNumber()) == 1?"男":"女"));
+                insure.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insure.getIdentifyNumber())));
+                insure.setOrderNo(insOrders.getOrderno());
                 insOrders.setInsureId(insure.getId());
+                insOrdersCarUserInfoService.save(insure);
 
                 //risk
                 for (int i = 0; i < risk.size(); i++) {
@@ -189,8 +180,6 @@ public class SyncCarInfoHandler {
                     }
                 }
                 insOrdersTaxService.saveBatch(insOrdersTaxes);
-
-
                 insOrdersService.save(insOrders);
             });
         }catch(Exception e){

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

@@ -80,13 +80,13 @@ public class SyncInsAreaCompany {
                     System.out.printf("insAreaCompanyOld is null");
                 }
                 BeanUtils.copyProperties(insAreaCompanyOld, insAreaCompany);
-//                insAreaCompany.setId(IdGenerate.nextId());
                 //1 处理车主信息
                 InsOrdersCarInfo ordersCarInfo = insOrdersCarInfoService.getById(insAreaCompanyOld.getCarInfoId());
                 InsAreaCompanyCarInfo carInfo = new InsAreaCompanyCarInfo();
                 BeanUtils.copyProperties(ordersCarInfo, carInfo);
                 carInfo.setId(IdGenerate.nextId());
                 insAreaCompany.setCarInfoId(carInfo.getId());
+                carInfo.setCompanyId(insAreaCompany.getId());
                 insAreaCompanyCarInfoService.saveOrUpdate(carInfo);
 
                 //2 处理车险用户信息
@@ -99,28 +99,19 @@ public class SyncInsAreaCompany {
                 List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
                 userInfoList.forEach(item -> {
                     String id = item.getId();
-                    boolean isOwner = false, isApply = false, isInsure = false;
-                    if (id.equals(insOrders.getOwnerId())) {
-                        isOwner = true;
-                    }
-                    if (id.equals(insOrders.getApplyId())) {
-                        isApply = true;
-                    }
-                    if (id.equals(insOrders.getInsureId())) {
-                        isInsure = true;
-                    }
                     InsAreaCompanyCarUserInfo userInfo = new InsAreaCompanyCarUserInfo();
                     BeanUtils.copyProperties(item, userInfo);
-                    userInfo.setId(IdGenerate.nextId());
-                    if (isOwner) {
+                    userInfo.setCompanyId(insAreaCompany.getId());
+                    if (id.equals(insOrders.getOwnerId())) {
                         insAreaCompany.setOwnerId(userInfo.getId());
                     }
-                    if (isApply) {
+                    if (id.equals(insOrders.getApplyId())) {
                         insAreaCompany.setApplyId(userInfo.getId());
                     }
-                    if (isInsure) {
+                    if (id.equals(insOrders.getInsureId())) {
                         insAreaCompany.setInsureId(userInfo.getId());
                     }
+
                     insAreaCompanyCarUserInfos.add(userInfo);
                 });
                 insAreaCompanyCarUserInfoService.saveOrUpdateBatch(insAreaCompanyCarUserInfos);