营运性质

src/main/java/com/ydtech/constants/enums/FileType.java

@@ -13,14 +13,16 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FileType {
 
-    IMAGE("image"),
-    PERSONNEL("personnel"),
-    POSTER("poster"),
-    AVATAR("avatar"),
-    SETTLE("settle"),
-    APK("apk");
+    IMAGE("image", "影像"),
+    PERSONNEL("personnel", "人员"),
+    POSTER("poster", "海报"),
+    AVATAR("avatar", "头像"),
+    SETTLE("settle", ""),
+    APK("apk", "安卓应用程序包文件");
 
 
     private final String type;
 
+    private final String desc;
+
 }

src/main/java/com/ydtech/constants/enums/dict/WhetherEnum.java

@@ -20,12 +20,12 @@ public enum WhetherEnum implements IBaseEnum {
     YES("1", "是", 2, 0),
     ;
 
-    private String code;
-    private String desc;
+    private final String code;
+    private final String desc;
     //排序
-    private Integer sort;
+    private final Integer sort;
     //状态  0 启用  1 不启用
-    private Integer status;
+    private final Integer status;
 
 
 }

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

@@ -8,7 +8,6 @@ import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenQuoteVo;
 import com.ydtech.modules.order.entity.api.guoren.constants.GoodsClassifyList;
-import com.ydtech.modules.order.entity.api.guoren.response.SpecialAgreementResponse;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenSpecialAgreement;
 import com.ydtech.modules.order.entity.vo.guoren.NonAutoInsuranceList;

src/main/java/com/ydtech/modules/order/entity/api/dajia/constants/TypeVehicleMapping.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.order.entity.api.dajia.constants;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TypeVehicleMapping {
+
+    TM_01("01", "营业出租租赁", "364003001", "374007"),
+    TM_02("02", "营业城市公交", "364003002", "374008"),
+    TM_03("03", "营业公路客运", "364003003", "374009"),
+    TM_04("04", "营业货运", "364004002", "374010"),
+    TM_05("05", "家庭自用", "364001001", "374001"),
+    TM_06("06", "非营业机关", "364002001", "374003"),
+    TM_07("07", "非营业企业", "364002002", "374002"),
+    TM_08("08", "非营业货运", "364004001", "374005");
+
+    private final String code;
+
+    private final String desc;
+
+    private final String cUsageCdeJq;
+
+    private final String cUsageCdeSy;
+
+}

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1008Request.java

@@ -660,55 +660,23 @@ public class ODR1008Request extends DaJiaBaseRequest {
 
         //使用性质
         List<RiskInfoVo> riskList = quoteInfoVo.getRiskList();
-        if(quoteInfoVo.getCarInfo().getCarnature().equals("01")) {
-            //运营性质
-            if(riskList.size() > 1){
-                //交商联合
-                vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U07.getCode().toString());
-                vehicleInfoDTO.setVehicleTraUsageCde(CUsageCde.U07.getCode());
-            }else if(riskList.size() == 1) {
-                if (riskList.get(0).getRiskCode().equals(InsuranceRisk.BUSINESS_CODE)) {
-                    //单商业
-                    vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U07.getCode().toString());
-                    vehicleInfoDTO.setVehicleTraUsageCde(CUsageCde.U07.getCode());
-                } else {
-                    // 单交强
-                    vehicleInfoDTO.setVehicleUsageCde(CUsageCdeJq.UJQ364003001.getCode().toString());
-                    vehicleInfoDTO.setVehicleTraUsageCde(CUsageCdeJq.UJQ364003001.getCode());
-                }
-            }
-        }else{
-            //非运营性质
-            if(riskList.size() > 1){
-                //交商联合
-                //如果是客车
-                if(VehicleType.VT_A0.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())) {
-                    vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U01.getCode().toString());
-                }else if(VehicleType.VT_A1.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())){
-                    //货车
-                    vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U04.getCode().toString());
-                }
-            }else if(riskList.size() == 1) {
-                if (riskList.get(0).getRiskCode().equals(InsuranceRisk.BUSINESS_CODE)) {
-                    if(VehicleType.VT_A0.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())) {
-                        //客车
-                        vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U01.getCode().toString());
-                    }else if(VehicleType.VT_A1.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())){
-                        //货车
-                        vehicleInfoDTO.setVehicleUsageCde(CUsageCde.U04.getCode().toString());
-                    }
-
-                } else {
-                    // 单交强
-                    if(VehicleType.VT_A0.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())) {
-                        //客车
-                        vehicleInfoDTO.setVehicleUsageCde(CUsageCdeJq.UJQ364001001.getCode().toString());
-                    }else if(VehicleType.VT_A1.getCode().equals(quoteInfoVo.getCarInfo().getCimodelclass())){
-                        //货车
-                        vehicleInfoDTO.setVehicleUsageCde(CUsageCdeJq.UJQ364004001.getCode().toString());
-                    }
-
-                }
+
+        String vehicleUse = quoteInfoVo.getCarInfo().getVehicleUse();
+        //运营性质
+        TypeVehicleMapping typeVehicleMapping = Enum.valueOf(TypeVehicleMapping.class, "TM_" + vehicleUse);
+        if(riskList.size() > 1){
+            //交商联合
+            vehicleInfoDTO.setVehicleUsageCde(typeVehicleMapping.getCUsageCdeSy());
+            vehicleInfoDTO.setVehicleTraUsageCde(Integer.valueOf(typeVehicleMapping.getCUsageCdeSy()));
+        }else if(riskList.size() == 1) {
+            if (riskList.get(0).getRiskCode().equals(InsuranceRisk.BUSINESS_CODE)) {
+                //单商业
+                vehicleInfoDTO.setVehicleUsageCde(typeVehicleMapping.getCUsageCdeJq());
+                vehicleInfoDTO.setVehicleTraUsageCde(Integer.valueOf(typeVehicleMapping.getCUsageCdeJq()));
+            } else {
+                // 单交强
+                vehicleInfoDTO.setVehicleUsageCde(typeVehicleMapping.getCUsageCdeSy());
+                vehicleInfoDTO.setVehicleTraUsageCde(Integer.valueOf(typeVehicleMapping.getCUsageCdeSy()));
             }
         }
 

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

@@ -219,7 +219,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             JSONObject accidentalDrivingVo = JSONObject.parseObject(JSONObject.toJSONString(t.getAccidentalDrivingVo()));
             InsAccidentalDrivingDajia accidentalDriving = null;
             List<InsAccidentalDrivingSubDajia> listByAccId = null;
-            if (!Objects.isNull(accidentalDrivingVo) && accidentalDrivingVo.size() > 0) {
+            if (!Objects.isNull(accidentalDrivingVo) && !accidentalDrivingVo.isEmpty()) {
                 //驾意险
                 accidentalDriving = getAccidentalDrivingByCode(accidentalDrivingVo.getString("rideRiskCode"),
                         accidentalDrivingVo.getInteger("quantity"));

src/main/java/com/ydtech/modules/protocol/entity/constants/PtlCrawlerApiType.java

@@ -13,7 +13,8 @@ public enum PtlCrawlerApiType {
     API_4(4, "核保"),
     API_5(5, "缴费查询"),
     API_6(6, "保单下载"),
-    API_7(7, "非车险查询");
+    API_7(7, "非车险查询"),
+    API_8(8, "人工核保状态刷新");
 
     private final int code;