优化

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -213,4 +213,9 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean delegate(@RequestBody DeliveredApplyDelegateQuery deliveredApplyDelegateQuery);
 
+    @ApiOperation("待补充车辆")
+    @GetMapping("/appendRetrievalCarsQk")
+    @ResponseBody
+    public ResultBean<List<CarListVos2>> appendRetrievalCarsQk(@SpringQueryMap DeliveredDetailssQuery query);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -201,4 +201,9 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVos2.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.api.autoservice.retrieval;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/12
+ **/
+@Data
+public class CarListVos2 {
+
+    @ApiModelProperty("折让")
+    private String discount;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("是否显示挂车信息")
+    private boolean showHandCarBtn;
+
+    private List<DeliveredDiscountVo> discountUse;
+
+    @ApiModelProperty("实际购车人")
+    private DeliveredUseMessagesVo realBuyer;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto2.java

@@ -84,4 +84,13 @@ public class DeliveredApplyDto2 implements Dto {
     private List<CarListVo> carList = new ArrayList<>();
     @ApiModelProperty("剩余")
     private List<DeliveredLeaveVo> discountLeave = new ArrayList<>();
+
+    @ApiModelProperty("责任人担保承诺书")
+    private List<String> promiseList = new ArrayList<>();
+
+    @ApiModelProperty("担保承诺书")
+    private List<String> danFileList = new ArrayList<>();
+
+    @ApiModelProperty("车辆登记合同")
+    private List<String> carFileList = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVoQk2.java

@@ -109,4 +109,13 @@ public class DeliveredDetailsVoQk2 implements Vo {
 
     private boolean showLoanUser;
 
+    @ApiModelProperty("责任人担保承诺书")
+    private List<String> promiseList = new ArrayList<>();
+
+    @ApiModelProperty("担保承诺书")
+    private List<String> danFileList = new ArrayList<>();
+
+    @ApiModelProperty("车辆登记合同")
+    private List<String> carFileList = new ArrayList<>();
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -210,4 +210,9 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) {
         return appBusDeliveredApplyService.delegate(deliveredApplyDelegateQuery);
     }
+
+    @Override
+    public ResultBean<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
+        return appBusDeliveredApplyService.appendRetrievalCarsQk(query);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -901,4 +901,13 @@ public class AppBusDeliveredApplyService {
         ResultBean resultBean = busDeliveredApplyFeign.delegate(deliveredDelegateQuery);
         return resultBean;
     }
+
+    public ResultBean<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
+        ResultBean<List<CarListVos2>> rb = ResultBean.fireFail();
+        DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery();
+        BeanUtil.copyProperties(query, deliverDetailsQuery);
+        ResultBean<List<AppCarListVo>> selectInfo = busDeliveredFeign.qkSelectInfo(deliverDetailsQuery);
+        List<CarListVos2> voList = Optional.ofNullable(selectInfo.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CarListVos2.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
 }