diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 2a1e3825fd..40cf8daf5f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/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> appendRetrievalCarsQk(@SpringQueryMap DeliveredDetailssQuery query); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index e0edb05e7b..500493a913 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/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> appendRetrievalCarsQk(DeliveredDetailssQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVos2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVos2.java new file mode 100644 index 0000000000..d7a29ab71f --- /dev/null +++ b/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 discountUse; + + @ApiModelProperty("实际购车人") + private DeliveredUseMessagesVo realBuyer; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto2.java index 256328fa61..a098a0d8fd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto2.java +++ b/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 carList = new ArrayList<>(); @ApiModelProperty("剩余") private List discountLeave = new ArrayList<>(); + + @ApiModelProperty("责任人担保承诺书") + private List promiseList = new ArrayList<>(); + + @ApiModelProperty("担保承诺书") + private List danFileList = new ArrayList<>(); + + @ApiModelProperty("车辆登记合同") + private List carFileList = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVoQk2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVoQk2.java index 9c5653b2aa..72c55b6af8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVoQk2.java +++ b/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 promiseList = new ArrayList<>(); + + @ApiModelProperty("担保承诺书") + private List danFileList = new ArrayList<>(); + + @ApiModelProperty("车辆登记合同") + private List carFileList = new ArrayList<>(); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 7b3d649509..e6d39e4669 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/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> appendRetrievalCarsQk(DeliveredDetailssQuery query) { + return appBusDeliveredApplyService.appendRetrievalCarsQk(query); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 03ab7cc95b..c7badf698b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/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> appendRetrievalCarsQk(DeliveredDetailssQuery query) { + ResultBean> rb = ResultBean.fireFail(); + DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery(); + BeanUtil.copyProperties(query, deliverDetailsQuery); + ResultBean> selectInfo = busDeliveredFeign.qkSelectInfo(deliverDetailsQuery); + List 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); + } } \ No newline at end of file