永城核保修改

src/main/java/com/ydtech/modules/ins/model/yc/audit/response/AuditResponse.java

@@ -72,14 +72,6 @@ public class AuditResponse {
     private String orderCode;
 
 
-    public String getStatusJq() {
-        return StringUtils.isEmpty(statusJq) ? "" : statusJq;
-    }
-
-    public String getStatusSY() {
-        return StringUtils.isEmpty(statusSY) ? "" : statusSY;
-    }
-
     @Data
     public static class ResponseHead {
 

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

@@ -186,4 +186,5 @@ public class YongChengOrderApiController {
     }
 
 
+
 }

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

@@ -136,9 +136,10 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     private final VerificationCodeIdentification verificationCodeIdentification;
 
-    private final  FeeRuleSchemeService feeRuleSchemeService;
+    private final FeeRuleSchemeService feeRuleSchemeService;
 
     private final SysAreaService sysAreaService;
+
     //==============================API 方式
     //
     public void gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo) {
@@ -159,18 +160,15 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         }
 
         //车辆年款不能超过注册日期
-        List<ModelsQueryResponse.VehicleInfo> vehicleInfoList = rd.getVehicleInfoList().stream()
-                .filter(a -> DateTimeUtil.dateIsAfter(carInfo.getRegisterDate(), a.getVehicleYear()))
-                .sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice))
-                .collect(Collectors.toList());
+        List<ModelsQueryResponse.VehicleInfo> vehicleInfoList =
+                rd.getVehicleInfoList().stream().filter(a -> DateTimeUtil.dateIsAfter(carInfo.getRegisterDate(), a.getVehicleYear())).sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
 
         //匹配的车辆信息数据  为空
         if (CollUtil.isEmpty(vehicleInfoList)) {
 
             //匹配金额
-            vehicleInfoList = rd.getVehicleInfoList().stream()
-                    .filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice()))
-                    .collect(Collectors.toList());
+            vehicleInfoList =
+                    rd.getVehicleInfoList().stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).collect(Collectors.toList());
 
             if (CollUtil.isNotEmpty(vehicleInfoList)) {
                 buildCarInfo(carInfo, vehicleInfoList.get(0));
@@ -178,19 +176,16 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             }
 
             //金额升序
-            vehicleInfoList = rd.getVehicleInfoList().stream()
-                    .sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice))
-                    .collect(Collectors.toList());
+            vehicleInfoList =
+                    rd.getVehicleInfoList().stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
 
             buildCarInfo(carInfo, vehicleInfoList.get(0));
             return;
         }
 
         //匹配的车辆信息数据
-        ModelsQueryResponse.VehicleInfo matchVehicleInfo = vehicleInfoList.stream()
-                .filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice()))
-                .findFirst()
-                .orElse(null);
+        ModelsQueryResponse.VehicleInfo matchVehicleInfo =
+                vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
 
         if (null != matchVehicleInfo) {
             buildCarInfo(carInfo, matchVehicleInfo);
@@ -199,12 +194,9 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         //匹配的车辆信息数据里  未匹配成功   默认选择第一条
         //排序  年款降序  金额升序
-        vehicleInfoList = vehicleInfoList.stream()
-                .sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehicleYear)
-                        .thenComparing((o1, o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()),
-                               StringUtils.toInt(o1.getVehiclePrice())))
-                        .reversed())
-                .collect(Collectors.toList());
+        vehicleInfoList =
+                vehicleInfoList.stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehicleYear).thenComparing((o1,
+                                                                                                                                     o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()), StringUtils.toInt(o1.getVehiclePrice()))).reversed()).collect(Collectors.toList());
         buildCarInfo(carInfo, vehicleInfoList.get(0));
 
     }
@@ -251,7 +243,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         m.getRequestLabel().getCondition().getVhl().setCCheckCodeSY("");
         m.getRequestLabel().getCondition().getVhl().setCQryCdeSY("");
 
-        if (rr.getHead().getErrorCode().equals("009999") && (rr.getHead().getErrorMessage().contains("车主") || rr.getHead().getErrorMessage().contains("投保人") || rr.getHead().getErrorMessage().contains("被保人"))) {
+        if ("009999".equals(rr.getHead().getErrorCode()) && (rr.getHead().getErrorMessage().contains("车主") || rr.getHead().getErrorMessage().contains("投保人") || rr.getHead().getErrorMessage().contains("被保人"))) {
             return rr;
         }
         //处理返回信息
@@ -505,7 +497,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
     }
 
 
-
     /**
      * 报价  转保业务处理
      */
@@ -585,9 +576,9 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             if (rd.getResponseHead().getReturnCode().equals("0000")) {
                 String statusJq = rd.getStatusJq();
                 String statusSy = rd.getStatusSY();
-                if (statusJq.equals("0") || statusSy.equals("0")) {
+                if ("0".equals(statusJq) || "0".equals(statusSy)) {
                     iac.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
-                } else if (statusJq.equals("3") || statusSy.equals("3")) {
+                } else if ("3".equals(statusJq) || "3".equals(statusSy)) {
                     iac.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                     StringBuilder sb = new StringBuilder();
                     if (null != rd.getSailResponseMessagedate()) {
@@ -1130,7 +1121,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 iac = buildCallBack(iac, param);
 
                 InsOrders order = insOrdersService.getById(iac.getOrderno());
-                if (StringUtils.toInt(order.getOrderstatus()) <StringUtils.toInt(iac.getOrderstatus())) {
+                if (StringUtils.toInt(order.getOrderstatus()) < StringUtils.toInt(iac.getOrderstatus())) {
                     order.setOrderstatus(iac.getOrderstatus());
                 }
 
@@ -1525,5 +1516,4 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     }
 
-
 }