terminal的api的pom文件引用错误,以及创建复制引用错的实体。

anrui-terminal/anrui-terminal-api/pom.xml

@@ -9,7 +9,6 @@
         <version>0.0.1</version>
         <relativePath/>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>anrui-terminal-api</artifactId>
@@ -30,7 +29,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-       <dependency>
+      <!-- <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-buscenter-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
@@ -53,7 +52,7 @@
             <artifactId>anrui-crm-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListVo;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
@@ -34,7 +33,6 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -60,7 +58,7 @@ import javax.validation.Valid;
         contextId = "anrui-terminal-BusAdvanceGinvoiceapply",
         name = "anrui-terminal",
         path = "autoservice/v1/advanceInvoice",
-        fallback = BusAdvanceGinvoiceapplyFeignFallback.class)
+        fallback = AppBusAdvanceGinvoiceapplyFeignFallback.class)
 public interface AppBusAdvanceGinvoiceapplyFeign {
 
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -1,13 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
 
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceVinDto;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
@@ -22,7 +14,6 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * Project: bus(bus) <br/>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
 
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
@@ -10,8 +9,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: bus(bus) <br/>
  * File: BusArrearsCarryVehicleApplyFeignFallback.java <br/>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java

@@ -1,8 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.contract;
 
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
-import com.yxt.anrui.base.api.commoncontract.CommonContractFeignFallback;
 import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -33,14 +30,14 @@ import javax.validation.Valid;
         contextId = "anrui-terminal-CommonContract",
         name = "anrui-terminal",
         path = "/autoservice/v1/contract",
-        fallback = CommonContractFeignFallback.class)
+        fallback = AppCommonContractFeignFallback.class)
 public interface AppCommonContractFeign {
 
 
     @ApiOperation("移动端-合同审核列表")
     @PostMapping("/getContractList")
     @ResponseBody
-    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
+    public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractsQuery> pagerQuery);
 
   /*  @ApiOperation("移动端-初始化合同审核")
     @GetMapping("/getContractInfo/{contractSid}/{userSid}")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java

@@ -1,7 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.contract;
 
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
 import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -25,7 +23,7 @@ import org.springframework.stereotype.Component;
 public class AppCommonContractFeignFallback implements AppCommonContractFeign {
 
     @Override
-    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
+    public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsPageVo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.autoservice.contract;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:26
+ * @Description
+ */
+@Data
+public class AppCommonContractsPageVo {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.terminal.api.autoservice.contract;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:26
+ * @Description
+ */
+@Data
+public class AppCommonContractsQuery implements Query {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

@@ -1,8 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
 
-import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppScmVehicleGressionFeignFallback;
-import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -46,22 +44,22 @@ public interface AppDiscountpackageFegin {
     @ApiOperation(value = "办理（同意）")
     @PutMapping("/agreeDiscountPackageApplyInfo")
     @ResponseBody
-    public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplyCompleteDto dto);
+    public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplysCompleteDto dto);
 
     @ApiOperation(value = "撤回流程")
     @PutMapping(value = "/recallDiscountPackageApplyInfo")
     @ResponseBody
-    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTasksVo flowTaskVo);
 
     @ApiOperation(value = "驳回任务")
     @PutMapping(value = "/rejectDiscountPackageApplyInfo")
     @ResponseBody
-    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTasksVo flowTaskVo);
 
     @ApiOperation(value = "终止任务")
     @PutMapping(value = "/stopDiscountPackageApplyInfo")
     @ResponseBody
-    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+    public ResultBean breakProcess(@RequestBody FlowTasksVo flowTaskVo);
 
     @ApiOperation("获取流程操作标题")
     @GetMapping("/getFlowOperateTitle")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
 
-import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -28,22 +27,22 @@ public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{
     }
 
     @Override
-    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+    public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
         return null;
     }
 
     @Override
-    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
         return null;
     }
 
     @Override
-    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+    public ResultBean taskReject(FlowTasksVo flowTaskVo) {
         return null;
     }
 
     @Override
-    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplyCompleteDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
 
-import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @Description
  */
 @Data
-public class BaseDiscountpackageApplyCompleteDto implements Dto {
+public class BaseDiscountpackageApplysCompleteDto implements Dto {
     private static final long serialVersionUID = 3240453987322803352L;
     @ApiModelProperty(value = "用户sid")
     @NotBlank(message = "参数错误：userSid")
@@ -41,5 +40,5 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
     @ApiModelProperty("调账车辆列表")
-    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseInternalPurchasesVehicle.java

@@ -0,0 +1,62 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:36
+ * @Description
+ */
+@Data
+public class BaseInternalPurchasesVehicle {
+
+    @ApiModelProperty("内购申请sid")
+    private String mainSid; // 内购申请sid
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型别名")
+    private String vehicleAlias; // 车型别名
+    @ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+    @ApiModelProperty("常用配置名称")
+    private String configName; // 常用配置名称
+    @ApiModelProperty("运费")
+    private String freight; // 运费
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("库存地点sid")
+    private String inventoryLocationSid; // 库存地点sid
+    @ApiModelProperty("库存地点名称")
+    private String inventoryLocationName; // 库存地点名称
+    @ApiModelProperty("内销价格")
+    private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
+    @ApiModelProperty("发票类型key")
+    private String invoiceTypeKey; // 发票类型key
+    @ApiModelProperty("发票类型value")
+    private String invoiceTypeValue; // 发票类型value
+    @ApiModelProperty("运费承担方sid")
+    private String freightUndertakerSid; // 运费承担方sid
+    @ApiModelProperty("运费承担方名称")
+    private String freightUndertakerName; // 运费承担方名称
+    @ApiModelProperty("是否调账（0未调账，1已调账）")
+    private String isAccadj; // 是否调账（0未调账，1已调账）
+    @ApiModelProperty("是否开票（0未开票，1已开票）")
+    private String isInvoicing; // 是否开票（0未开票，1已开票）
+    @ApiModelProperty("销售指导价")
+    private BigDecimal guidedPrice; // 销售指导价
+    @ApiModelProperty("调回状态key")
+    private String recallStateKey; // 调回状态key
+    @ApiModelProperty("调回状态value")
+    private String recallStateValue; // 调回状态value
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/FlowTasksVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:34
+ * @Description
+ */
+@Data
+public class FlowTasksVo {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("businessSid ")
+    private String businessSid;
+    @ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();
+}

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

@@ -25,12 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
-import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@@ -76,7 +70,7 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("移动端-初始化 出库申请 待出库进入")
     @PostMapping("/getRetrievalApplyInfo")
     @ResponseBody
-    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(@RequestBody AppDeliveredDetailsQuery query);
+    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(@RequestBody AppDeliveredDetailssQuery query);
 
     @ApiOperation("手机端-获取 出库申请列表")
     @PostMapping("/getRetrievalApplyList")
@@ -115,7 +109,7 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("初始化 出库申请 车架号")
     @GetMapping("/getRetrievalCarVin")
     @ResponseBody
-    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
+    public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
 
     /*  @ApiOperation("删除 出库申请记录")
       @DeleteMapping("/deleteRetrievalInfo/{sid}")

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

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
-import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@@ -61,7 +59,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     }
 
     @Override
-    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
         return null;
     }
 
@@ -86,7 +84,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     }
 
     @Override
-    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
+    public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
         return null;
     }
 

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.autoservice.retrieval;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:44
+ * @Description
+ */
+@Data
+public class AppCarVinsListVo {
+}

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

@@ -0,0 +1,13 @@
+package com.yxt.anrui.terminal.api.autoservice.retrieval;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:47
+ * @Description
+ */
+@Data
+public class AppDeliveredDetailssQuery implements Query {
+}

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

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -2,7 +2,6 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@@ -77,7 +76,7 @@ import java.util.List;
         contextId = "anrui-terminal-BusSalesOrder",
         name = "anrui-terminal",
         path = "/autoservice/v1/saleOrders",
-        fallback = BusSalesOrderFeignFallback.class)
+        fallback = AppBusSalesOrderFeignFallback.class)
 public interface AppBusSalesOrderFeign {
 
     /*-------------------------------------App销售订单接口------------------------------------------------*/

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillDetailsVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 12:01
+ * @Description
+ */
+@Data
+public class AppCustomerBillDetailsVo {
+
+    @ApiModelProperty("实收金额")
+    private String money;
+    @ApiModelProperty("款项类型")
+    private String paymentType;
+    @ApiModelProperty("创建人")
+    private String handle;
+    @ApiModelProperty("创建人Sid")
+    private String staffSid;
+    @ApiModelProperty("创建时间")
+    private String date;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户类型")
+    private String customerKey;
+    @ApiModelProperty("客户头像")
+    private String customerImage;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummaryDetailssVo.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:55
+ * @Description
+ */
+@Data
+public class AppCustomerBillSummaryDetailssVo {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("客户类型")
+    private String customerKey;
+
+    @ApiModelProperty("客户头像")
+    private String customerImage;
+
+    @ApiModelProperty("合同日期")
+    private String date;
+
+    @ApiModelProperty("未收费用")
+    private String unReceivable;
+
+    @ApiModelProperty("应收费用")
+    private String receivable;
+
+    @ApiModelProperty("实缴费用")
+    private String paid;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 12:00
+ * @Description
+ */
+@Data
+public class AppCustomerBillSummarysQuery implements Query {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 12:00
+ * @Description
+ */
+@Data
+public class AppCustomerBillSummarysVo {
+
+    @ApiModelProperty("应收")
+    private String receivable;
+
+    @ApiModelProperty("未收")
+    private String unReceivable;
+
+    @ApiModelProperty("时间")
+    private String date;
+
+    @ApiModelProperty("实收")
+    private String paid;
+
+    @ApiModelProperty("付款sid")
+    private String paymentSid;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("款项类型")
+    private String payType;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
-import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -87,14 +85,14 @@ public interface AppFinCollectionConfirmationFeign {
 
     @ApiOperation("app获取客户账单列表")
     @PostMapping("/getCustomerBillList")
-    public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(@RequestBody PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq);
+    public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(@RequestBody PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq);
 
     @ApiOperation("app获取客户合同账单列表")
     @PostMapping("/getCustomerBill2List")
-    public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(@RequestBody PagerQuery<AppCustomerBillSummaryQuery> pq);
+    public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(@RequestBody PagerQuery<AppCustomerBillSummarysQuery> pq);
 
     @ApiOperation("app获取账单详情")
     @PostMapping("/getCustomerBillDetail/{paymentSid}")
-    public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
+    public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
-import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -85,17 +83,17 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
+	public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
+	public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
+	public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
 		return null;
 	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 11:56
+ * @Description
+ */
+@Data
+public class AppFinUncollectedReceivablesDetailedsQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称")
+    private String name;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.supplychain.baseInfo;
 
-import com.itextpdf.text.pdf.PRAcroForm;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java

@@ -25,15 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
 
-import com.yxt.anrui.base.api.basemodelmodprice.*;
-import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
-import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
-import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
-import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 /**

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java

@@ -2,7 +2,6 @@ package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java

@@ -27,7 +27,6 @@ package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 13:52
+ * @Description
+ */
+@Data
+public class AppBaseConfigNowCarsQuery {
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrg;
+
+    @ApiModelProperty("只考虑车架号")
+    private String names;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsVo.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 13:51
+ * @Description
+ */
+@Data
+public class AppBaseConfigNowCarsVo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("销售指导价")
+    private String price;
+
+    @ApiModelProperty("现车列表")
+    private List<AppBaseVinNowCarVo> records;
+
+    @ApiModelProperty("常用配置")
+    private String commonlyConfig;
+
+    @ApiModelProperty(value = "车型标签")
+    private String labelName;
+
+    @ApiModelProperty(value = "车型标签")
+    private String labelValue;
+
+    @ApiModelProperty(value = "车型标签")
+    private List<ModelLabel> typeList;
+
+    private BaseModelVehicleVersionVo carDetailPage;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigOrderCarsVo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 13:52
+ * @Description
+ */
+@Data
+public class AppBaseConfigOrderCarsVo {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeign.java

@@ -25,9 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.supplychain.stock;
 
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
-import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -56,15 +53,15 @@ public interface AppBaseVehicleStockFeign {
     @ApiOperation("App库存车型获取当前车型配置（标签）")
     @PostMapping("/getStockModelConfigList")
     @ResponseBody
-    public ResultBean<ModelConfigVo> getStockModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
+    public ResultBean<ModelConfigsVo> getStockModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListsQuery> pagerQuery);
 
     @ApiOperation("手机端-库存配置列表获取现车列表")
     @PostMapping("/getStockModelNowCarList")
     @ResponseBody
-    public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
+    public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarsQuery pagerQuery);
 
     @ApiOperation("手机端-库存配置列表获取排产列表")
     @PostMapping("/getStockModelOrderCarList")
     @ResponseBody
-    public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
+    public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(@RequestBody AppBaseConfigNowCarsQuery pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeignFallback.java

@@ -25,14 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.supplychain.stock;
 
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
-import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -61,17 +53,17 @@ public class AppBaseVehicleStockFeignFallback implements AppBaseVehicleStockFeig
     }
 
     @Override
-    public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
+    public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
         return null;
     }
 
     @Override
-    public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
         return null;
     }
 
     @Override
-    public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
         return null;
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVinNowCarVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 14:01
+ * @Description
+ */
+@Data
+public class AppBaseVinNowCarVo {
+
+    @ApiModelProperty("车辆sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("颜色")
+    private String color;
+
+    @ApiModelProperty("合格证")
+    private String certificate;
+
+    @ApiModelProperty("存放地点")
+    private String address;
+
+    @ApiModelProperty("促销价")
+    private String promotionPrice;
+
+    @ApiModelProperty(value = "销售政策标签")
+    private String label;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageVo.java

@@ -1,7 +1,5 @@
 package com.yxt.anrui.terminal.api.supplychain.stock;
 
-import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.VehicleGressionVehVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/BaseModelVehicleVersionVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 14:01
+ * @Description
+ */
+@Data
+public class BaseModelVehicleVersionVo {
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigListsQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 13:51
+ * @Description
+ */
+@Data
+public class ModelConfigListsQuery implements Query {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigsVo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 13:49
+ * @Description
+ */
+@Data
+public class ModelConfigsVo {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/MoreConfigVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.supplychain.stock;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/29 14:05
+ * @Description
+ */
+@Data
+public class MoreConfigVo {
+    
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "现车数量")
+    private String nowCarNum;
+
+    @ApiModelProperty(value = "排产数量")
+    private String produceCarNum;
+    @ApiModelProperty(value = "分公司sid:车型及配置关联中的后端内部使用")
+    private String useOrgSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java

@@ -1,11 +1,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.contract;
 
 
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
+import com.yxt.anrui.terminal.api.autoservice.contract.*;
-import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
-import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractFeign;
-import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
-import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
 import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -41,7 +37,7 @@ public class AppCommonContractRest implements AppCommonContractFeign {
 
     @Override
     @ApiOperation("移动端-合同审核列表")
-    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
+    public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
         return appCommonContractService.getContractList(pagerQuery);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

@@ -2,15 +2,19 @@ package com.yxt.anrui.terminal.biz.autoservice.contract;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.api.commoncontract.flowable.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractsPageVo;
+import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractsQuery;
 import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
 import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
 import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
+import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -19,8 +23,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 /**
@@ -53,9 +60,18 @@ public class AppCommonContractService {
      * @param pagerQuery
      * @return
      */
-    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
+    public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
-        ResultBean resultBean = commonContractFeign.getContractList(pagerQuery);
+      /*  ResultBean resultBean = commonContractFeign.getContractList(pagerQuery);
-        return resultBean;
+        return resultBean;*/
+
+        ResultBean<PagerVo<AppCommonContractsPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppCommonContractQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppCommonContractPageVo>> resultBean = commonContractFeign.getContractList(pq);
+        List<AppCommonContractsPageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCommonContractsPageVo.class)).collect(Collectors.toList());
+        PagerVo<AppCommonContractsPageVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setData(v);
     }
 
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
 
-import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,22 +38,22 @@ public class AppDiscountPackageApplyRest implements AppDiscountpackageFegin {
     }
 
     @Override
-    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+    public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
         return appDiscountPackageApplyService.complete(dto);
     }
 
     @Override
-    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
         return appDiscountPackageApplyService.revokeProcess(flowTaskVo);
     }
 
     @Override
-    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+    public ResultBean taskReject(FlowTasksVo flowTaskVo) {
         return appDiscountPackageApplyService.taskReject(flowTaskVo);
     }
 
     @Override
-    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
         return appDiscountPackageApplyService.breakProcess(flowTaskVo);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
@@ -57,29 +58,35 @@ public class AppDiscountPackageApplyService {
         return rb.success();
     }
 
-    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+    public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto();
+        BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new BaseDiscountpackageApplyCompleteDto();
         BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto);
         baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
         return rb.success();
     }
 
-    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
-        baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo);
+        FlowTaskVo flowTaskVo1 = new FlowTaskVo();
+        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo1);
         return rb.success();
     }
 
-    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+    public ResultBean taskReject(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
-        baseDiscountpackageApplyFeign.taskReject(flowTaskVo);
+        FlowTaskVo flowTaskVo1 = new FlowTaskVo();
+        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        baseDiscountpackageApplyFeign.taskReject(flowTaskVo1);
         return rb.success();
     }
 
-    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
-        baseDiscountpackageApplyFeign.breakProcess(flowTaskVo);
+        FlowTaskVo flowTaskVo1 = new FlowTaskVo();
+        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        baseDiscountpackageApplyFeign.breakProcess(flowTaskVo1);
         return rb.success();
     }
 

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

@@ -70,7 +70,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
         return appBusDeliveredApplyService.getRetrievalApplyInfo(query);
     }
 
@@ -95,7 +95,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
+    public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
         return appBusDeliveredApplyService.getRetrievalCarVin(sid);
     }
 

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.retrieval;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.buscenter.api.busdelivered.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
@@ -47,8 +48,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 /**
@@ -90,7 +94,7 @@ public class AppBusDeliveredApplyService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
         ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
         AppDeliveredDetailsQuery appDeliveredDetailsQuery = new AppDeliveredDetailsQuery();
         BeanUtils.copyProperties(query, appDeliveredDetailsQuery);
@@ -129,11 +133,12 @@ public class AppBusDeliveredApplyService {
         return resultBean;
     }
 
-    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
+    public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
-        ResultBean<List<AppCarVinListVo>> rb = ResultBean.fireFail();
+        ResultBean<List<AppCarVinsListVo>> rb = ResultBean.fireFail();
         ResultBean<List<AppCarVinListVo>> retrievalCarVin = busDeliveredApplyDetailsFeign.getRetrievalCarVin(sid);
         List<AppCarVinListVo> data = retrievalCarVin.getData();
-        return rb.success().setData(data);
+        List<AppCarVinsListVo> voList = Optional.ofNullable(data).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCarVinsListVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
     }
 
     public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -25,15 +25,18 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
-import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillDetailVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryQuery;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -93,7 +96,6 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     /**
      * 手机端—款项确认申请详情
      *
-     * @param collectionBillSid
      * @return
      */
     @Override
@@ -135,17 +137,17 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     }
 
     @Override
-    public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
         return appfinCollectionConfirmationService.getCustomerBillList(pq);
     }
 
     @Override
-    public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
         return appfinCollectionConfirmationService.getCustomerBill2List(pq);
     }
 
     @Override
-    public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
+    public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
         return appfinCollectionConfirmationService.getCustomerBillDetail(paymentSid);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -30,16 +30,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
-import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
-import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
-import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -185,8 +180,15 @@ public class AppFinCollectionConfirmationService {
      * @param pq
      * @return
      */
-    public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
-        return finUncollectedReceivablesDetailedFeign.getCustomerBillList(pq);
+        ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pqq = CoverUtils.getPagerQuery(pq);
+        ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBillList(pqq);
+        List<AppCustomerBillSummaryDetailssVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillSummaryDetailssVo.class)).collect(Collectors.toList());
+        PagerVo<AppCustomerBillSummaryDetailssVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 
     /**
@@ -195,8 +197,15 @@ public class AppFinCollectionConfirmationService {
      * @param pq
      * @return
      */
-    public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
-        return finUncollectedReceivablesDetailedFeign.getCustomerBill2List(pq);
+        ResultBean<PagerVo<AppCustomerBillSummarysVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppCustomerBillSummaryQuery> pqq = CoverUtils.getPagerQuery(pq);
+        ResultBean<PagerVo<AppCustomerBillSummaryVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBill2List(pqq);
+        List<AppCustomerBillSummarysVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillSummarysVo.class)).collect(Collectors.toList());
+        PagerVo<AppCustomerBillSummarysVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 
     /**
@@ -205,7 +214,13 @@ public class AppFinCollectionConfirmationService {
      * @param paymentSid
      * @return
      */
-    public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
+    public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
-        return finUncollectedReceivablesDetailedFeign.getCustomerBillDetail(paymentSid);
+        ResultBean<PagerVo<AppCustomerBillDetailsVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<AppCustomerBillDetailVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBillDetail(paymentSid);
+        List<AppCustomerBillDetailsVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillDetailsVo.class)).collect(Collectors.toList());
+        PagerVo<AppCustomerBillDetailsVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockRest.java

@@ -25,20 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.supplychain.basevehiclestock;
 
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
-import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
 import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarQuery;
 import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo;
 import com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
+import com.yxt.anrui.terminal.api.supplychain.stock.*;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
-import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
-import com.yxt.anrui.terminal.api.supplychain.stock.AppBaseVehicleStockFeign;
-import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
-import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
-import com.yxt.anrui.terminal.biz.supplychain.scmvehiclegression.AppScmVehicleGressionService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -62,17 +52,17 @@ public class AppBaseVehicleStockRest implements AppBaseVehicleStockFeign {
     }
 
     @Override
-    public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
+    public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
         return appBaseVehicleStockService.getStockModelConfigList(pagerQuery);
     }
 
     @Override
-    public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
         return appBaseVehicleStockService.getStockModelNowCarList(pagerQuery);
     }
 
     @Override
-    public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
         return appBaseVehicleStockService.getStockModelOrderCarList(pagerQuery);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockService.java

@@ -30,10 +30,7 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
 import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
 import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.terminal.api.supplychain.stock.*;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
-import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -57,22 +54,32 @@ public class AppBaseVehicleStockService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
+    public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
-        ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
+        ResultBean<ModelConfigsVo> rb = ResultBean.fireFail();
+        ModelConfigsVo modelConfigsVo = new ModelConfigsVo();
         PagerQuery<ModelConfigListQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<ModelConfigVo> modelConfigLableList = baseModelConfigFeign.getStockModelConfigList(pq);
-        return rb.success().setData(modelConfigLableList.getData());
+        BeanUtil.copyProperties(modelConfigLableList.getData(), modelConfigsVo);
+        return rb.success().setData(modelConfigsVo);
     }
 
-    public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
-        ResultBean<AppBaseConfigNowCarVo> rb = ResultBean.fireFail();
+        ResultBean<AppBaseConfigNowCarsVo> rb = ResultBean.fireFail();
-        ResultBean<AppBaseConfigNowCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelNowCarList(pagerQuery);
+        AppBaseConfigNowCarsVo appBaseConfigNowCarsVo = new AppBaseConfigNowCarsVo();
-        return rb.success().setData(stockModelNowCarList.getData());
+        AppBaseConfigNowCarQuery appBaseConfigNowCarQuery = new AppBaseConfigNowCarQuery();
+        BeanUtil.copyProperties(pagerQuery, appBaseConfigNowCarQuery);
+        ResultBean<AppBaseConfigNowCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelNowCarList(appBaseConfigNowCarQuery);
+        BeanUtil.copyProperties(stockModelNowCarList.getData(), appBaseConfigNowCarsVo);
+        return rb.success().setData(appBaseConfigNowCarsVo);
     }
 
-    public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
+    public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
-        ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
+        ResultBean<AppBaseConfigOrderCarsVo> rb = ResultBean.fireFail();
-        ResultBean<AppBaseConfigOrderCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelOrderCarList(pagerQuery);
+        AppBaseConfigOrderCarsVo appBaseConfigOrderCarsVo = new AppBaseConfigOrderCarsVo();
-        return rb.success().setData(stockModelNowCarList.getData());
+        AppBaseConfigNowCarQuery appBaseConfigNowCarQuery = new AppBaseConfigNowCarQuery();
+        BeanUtil.copyProperties(pagerQuery, appBaseConfigNowCarQuery);
+        ResultBean<AppBaseConfigOrderCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelOrderCarList(appBaseConfigNowCarQuery);
+        BeanUtil.copyProperties(stockModelNowCarList.getData(), appBaseConfigOrderCarsVo);
+        return rb.success().setData(appBaseConfigOrderCarsVo);
     }
 }