1.协议添加描述

2.车型排序修改

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

@@ -10,7 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Api(tags = "车型")
 @RestController
@@ -26,7 +28,10 @@ public class CarModelController {
     @GetMapping("/vinSearch")
     @ApiOperation("vin码查询")
     public HttpResult<List<CarModelDTO>> vinSearch(@RequestParam String frameNo) {
-        return carModelService.vinSearch(frameNo);
+        List<CarModelDTO> map = carModelService.vinSearch(frameNo);
+        List<CarModelDTO> carModelDTOS =
+                map.stream().sorted(Comparator.comparing(CarModelDTO::getReplacementValue)).collect(Collectors.toList());
+        return HttpResult.ok(carModelDTOS);
     }
 
 

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

@@ -7,6 +7,6 @@ import java.util.List;
 
 public interface CarModelService {
 
-    HttpResult<List<CarModelDTO>> vinSearch(String frameNo);
+    List<CarModelDTO> vinSearch(String frameNo);
 
 }

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

@@ -39,7 +39,7 @@ public class CarModelServiceImpl implements CarModelService {
     }
 
     @Override
-    public HttpResult<List<CarModelDTO>> vinSearch(String frameNo) {
+    public List<CarModelDTO> vinSearch(String frameNo) {
         //初始Key
         StringBuilder redisKey = new StringBuilder();
         redisKey.append(VIN_SEARCH_KEY);
@@ -47,8 +47,8 @@ public class CarModelServiceImpl implements CarModelService {
         //从缓存中查数据
         if(!Objects.isNull(redisTemplate.opsForValue().get(redisKey.toString()))){
             String carModeStr = redisTemplate.opsForValue().get(redisKey.toString());
-            List<CarModelDTO> carModelDTOS = JSON.parseArray(carModeStr, CarModelDTO.class);
-            return HttpResult.ok(carModelDTOS);
+           return  JSON.parseArray(carModeStr, CarModelDTO.class);
+
         }
 
         //从数据库中查数据
@@ -56,20 +56,20 @@ public class CarModelServiceImpl implements CarModelService {
         if (!carModelDTOS.isEmpty()) {
             //进行缓存存储
             redisTemplate.opsForValue().set(redisKey.toString(),JSON.toJSONString(carModelDTOS),VIN_SEARCH_KEY_TIME, TimeUnit.HOURS);
-            return HttpResult.ok(carModelDTOS);
+            return carModelDTOS;
         }
 
         List<CarModelDTO> carModelDTOS1 = zhongMeiOrderService.vinSearch(frameNo);
         if (!carModelDTOS1.isEmpty()) {
             //进行缓存存储
             redisTemplate.opsForValue().set(redisKey.toString(),JSON.toJSONString(carModelDTOS1),1, TimeUnit.HOURS);
-            return HttpResult.ok(carModelDTOS1);
+            return carModelDTOS1;
         }
 //        List<CarModelDTO> carModelDTOS2 = yongAnOrderService.vinSearch(frameNo);
 //        if (!carModelDTOS2.isEmpty()) {
 //            return HttpResult.ok(carModelDTOS2);
 //        }
-        return HttpResult.ok(Collections.emptyList());
+        return Collections.emptyList();
     }
 
 }

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

@@ -144,11 +144,13 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         modelInquiry(modelName, car);
 
         List<CarModelDTO> map = SimpleStadarCarDTOConvert.INSTANCE.map(car);
+        List<CarModelDTO> carModelDTOS = map.stream().sorted(Comparator.comparing(CarModelDTO::getReplacementValue)).collect(Collectors.toList());
+
         //数据存储到缓存中
-        if (!map.isEmpty()) {
+        if (!carModelDTOS.isEmpty()) {
             redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(map), VIN_SEARCH_KEY_TIME, TimeUnit.HOURS);
         }
-        return HttpResult.ok(map);
+        return HttpResult.ok(carModelDTOS);
     }
 
     @Override

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -49,7 +49,7 @@
         <collection property="agreement" ofType="com.ydtech.modules.protocol.entity.dto.PtlAgreementDto">
             <id property="id" column="agreement_id"/>
             <result property="agreementName" column="agreement_name"/>
-            <result property="agreementName" column="underwriting_description"/>
+            <result property="underwritingDescription" column="underwriting_description"/>
             <result property="apiType" column="api_type"/>
         </collection>
 
@@ -67,7 +67,7 @@
     </sql>
 
     <select id="getAgreementCompany" resultMap="AgreementCompanyResultMap">
-        select eic.*, pa.id, pa.underwriting_description as agreement_id, pa.agreement_name, paa.api_type
+        select eic.*, pa.id as agreement_id, pa.agreement_name, paa.api_type, pa.underwriting_description
         from esm_ins_company as eic
                  left join ptl_agreement as pa on pa.insurance_company_id = eic.id
                  left join ptl_agreement_attribution as paa on paa.id = pa.id