1、永诚修改车辆信息选取规则。

src/main/java/com/ydtech/aop/LogAspect.java

@@ -1,9 +1,11 @@
 package com.ydtech.aop;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysLog;
 import com.ydtech.modules.admin.service.SysLogService;
+import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -45,8 +47,12 @@ public class LogAspect {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
 
+        String userId = "";
+        if(null != StpUtil.getLoginId()){
+            userId = StpUtil.getLoginId().toString();
+        }
         //请求人 url method ip class_method
-        SysLog sysLog = new SysLog("", request.getRequestURL().toString(), request.getMethod(), joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
+        SysLog sysLog = new SysLog(userId, request.getRequestURL().toString(), request.getMethod(), joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
 //        SysLog sysLog = new SysLog(JwtTokenUtils.getUsernameFromRequest(request), request.getRequestURL().toString(), request.getMethod(), joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
 
         try {

src/main/java/com/ydtech/modules/ins/model/vo/CustomerInfoVo.java

@@ -1,5 +1,9 @@
 package com.ydtech.modules.ins.model.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ydtech.validation.annotation.CheckDateTime;
 import com.ydtech.validation.annotation.CheckIdentifyNumber;
 import io.swagger.annotations.ApiModel;
@@ -33,15 +37,6 @@ public class CustomerInfoVo {
     @ApiModelProperty("身份证类型")
     private String identifyType;
 
-//    @ApiModelProperty("省")
-//    private String province;
-//
-//    @ApiModelProperty("市")
-//    private String city;
-//
-//    @ApiModelProperty("县")
-//    private String county;
-
     @ApiModelProperty("省市区数组")
     private List<String> provinceData = new ArrayList<>();
 

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -329,10 +329,6 @@ public class YcBuildData {
         }
 
 
-//        AccidentResponseVo arVo = new AccidentResponseVo();
-//        arVo.setProjectCode(proposalResp.getAmount());
-//        List<AccidentResponseVo> accidentResponseVos = new ArrayList<>();
-
 
         //平台返回信息
         if (null != rd.getTfiWarnList()) {

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -242,8 +242,19 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
         //匹配的车辆信息数据  为空
         if (CollUtil.isEmpty(vehicleInfoList)) {
+
+            //匹配金额
+            vehicleInfoList = rd.getVehicleInfoList().stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(vehicleInfoList)){
+                buildCarInfo(carInfo, vehicleInfoList.get(0));
+                return;
+            }
+
+            //金额升序
+            vehicleInfoList = rd.getVehicleInfoList().stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
             buildCarInfo(carInfo, rd.getVehicleInfoList().get(0));
             return;
+
         }
 
         //匹配的车辆信息数据
@@ -365,13 +376,6 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 //            updateApiLog(apiLog, iac);
         quoteRespVo.setCompanyId(iac.getId());
 
-
-//        CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo().set;
-//        //被保人信息
-//        CustomerInfoVo insuredPersonInfo = yaQuoteInfoVo.getInsuredPersonInfo();
-//        //车主
-//        CustomerInfoVo ownerInfo =
-
         //查询码交强
         String queryCodeJq = rr.getVhl().getCQryCdeJQ();
         //查询码商业
@@ -383,9 +387,6 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
         insOrdersService.updateById(order);
         if (CollUtil.isNotEmpty(requestInfoList)) {
-//            requestInfoList.stream().forEach(c -> {
-//                System.err.println("========请求流程信息==========：" + c);
-//            });
             quoteRespVo.getWarnMessageList().addAll(requestInfoList);
         }
 
@@ -819,9 +820,16 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                         iac.setAuditopinion("交强审核意见：" + param.getJqmessage() + "| 商业审核意见：" +param.getSymessage());
                     }
 
+                    StringBuffer sss = new StringBuffer();
+                    sss.append("变更前订单状态："+ order.getOrderstatus());
+                    sss.append("变更前子订单状态："+ iac.getOrderstatus());
+
                     //构造订单状态
                     buildOrderStatus(order, iac);
 
+                    sss.append("变更后订单状态："+order.getOrderstatus());
+                    log.info("-----------订单状态变动----------："+sss.toString());
+
                     insAreaCompanyService.updateById(iac);
                     insOrdersService.updateById(order);