销售订单-移动端销售订单详情信息对象vo

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -23,11 +23,12 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.buscenter.api.bussalesorder.app;
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:27
+ * @Description
+ */
+@Data
+public class AppOrderDepositInfoVo implements Vo {
+    private static final long serialVersionUID = 3569780647862829018L;
+
+    @ApiModelProperty(value = "单台订金")
+    private String deposit;
+    @ApiModelProperty(value = "订金合计")
+    private String depositTotal;
+    @ApiModelProperty(value = "订金备注")
+    private String depositRemarks;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -0,0 +1,60 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:23
+ * @Description
+ */
+@Data
+public class AppOrderDetailsVo implements Vo {
+    private static final long serialVersionUID = 430116235810980123L;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractId;
+    @ApiModelProperty(value = "制单日期")
+    private String orderDate;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+    @ApiModelProperty(value = "客户头像")
+    private String customerImage;
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+    @ApiModelProperty(value = "客户电话")
+    private String phone;
+    @ApiModelProperty(value = "客户类型")
+    private String customerKey;
+    @ApiModelProperty(value = "订单类型")
+    private String orderType;
+    @ApiModelProperty(value = "挂靠公司")
+    private String affiliated;
+    @ApiModelProperty(value = "开票类型")
+    private String invoiceType;
+    @ApiModelProperty(value = "销售机构")
+    private String salesOrg;
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    @ApiModelProperty(value = "销售专员")
+    private String sellerName;
+    @ApiModelProperty(value = "保险信息")
+    private String insuranceInfo;
+    @ApiModelProperty(value = "总优惠")
+    private String totaldiscount;
+    @ApiModelProperty(value = "补充说明")
+    private String addRemarks;
+    @ApiModelProperty(value = "车型信息")
+    private AppOrderModelInfoVo modelInfo;
+    @ApiModelProperty(value = "价格信息")
+    private AppOrderPriceInfoVo priceInfo;
+    @ApiModelProperty(value = "上装信息")
+    private AppOrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "主车优惠")
+    private List<AppOrderDiscountListVo> discountList;
+    @ApiModelProperty(value = "订金信息")
+    private AppOrderDepositInfoVo depositInfo;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDiscountListVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:26
+ * @Description
+ */
+@Data
+public class AppOrderDiscountListVo implements Vo {
+    private static final long serialVersionUID = -3316798613545948890L;
+
+    @ApiModelProperty(value = "优惠名称")
+    private String discountName;
+    @ApiModelProperty(value = "价值")
+    private String price;
+    @ApiModelProperty(value = "说明")
+    private String explain;
+    @ApiModelProperty(value = "数量")
+    private String number;
+    @ApiModelProperty(value = "总价值")
+    private String total;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:24
+ * @Description
+ */
+@Data
+public class AppOrderModelInfoVo implements Vo {
+    private static final long serialVersionUID = -4115558574921406198L;
+
+    @ApiModelProperty(value = "车型图片")
+    private String modelImage;
+    @ApiModelProperty(value = "车型名称")
+    private String modelName;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+    private String brand;
+    private String price;
+    @ApiModelProperty(value = "类型")
+    private String type;
+    @ApiModelProperty(value = "车架号")
+    private List<String> vinList;
+    @ApiModelProperty(value = "采购订单编号")
+    private List<String> orderList;
+    @ApiModelProperty(value = "合计数量")
+    private String total;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:25
+ * @Description
+ */
+@Data
+public class AppOrderPriceInfoVo implements Vo {
+    private static final long serialVersionUID = 1242900120552287570L;
+
+    @ApiModelProperty(value = "主车成交价")
+    private String transactionPrice;
+    @ApiModelProperty(value = "台数")
+    private String number;
+
+    @ApiModelProperty(value = "车价合计")
+    private String totalPrice;
+    @ApiModelProperty(value = "预计提车日期")
+    private String date;
+    @ApiModelProperty(value = "预计提车地点")
+    private String address;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderRemarkDto.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder.app;
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:26
+ * @Description
+ */
+@Data
+public class AppOrderTopInfoVo implements Vo {
+    private static final long serialVersionUID = -6895216586396967122L;
+
+    /**
+     * 拼接字段：委改方式：小委改、委改厂：第三委改厂、外廓尺寸：7.8m*3m、板材厚度：5cm、板材材料：合金材质、公告型号：T-B123456
+     * 字段为null或者“” 时 不拼接
+     */
+    @ApiModelProperty(value = "上装信息")
+    private String topBean;
+    @ApiModelProperty(value = "合同附件")
+    private List<String> contractImages;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -33,7 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderSubmitInfoVo;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -38,7 +38,7 @@
         where sid = #{businessSid}
     </update>
     <!--app查询销售订单列表-->
-    <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo">
+    <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
         SELECT bo.sid                                 as saleOrderSid,
                bo.billNo                              as saleOrderId,
                bo.customerClass                       as customerType,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.buscenter.biz.bussalesorder;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -49,6 +49,8 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDeta
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
@@ -39,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -220,5 +222,10 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<OrderSubmitInfoVo> getSubmitInfo(@PathVariable(value = "saleOrderSid") String sid);
 
+    @ApiOperation("销售订单详情")
+    @GetMapping("/getSaleOrderDetail/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<OrderDetailsVo> getSaleOrderDetail(@PathVariable(value = "saleOrderSid") String sid);
+
 
 }

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
@@ -38,6 +39,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -189,4 +191,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<OrderSubmitInfoVo> getSubmitInfo(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail(String sid) {
+        return null;
+    }
 }

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

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * @Author dimengzhe
  * @Date 2022/6/7 14:48
- * @Description
+ * @Description 销售订单-订金信息
  */
 @Data
 public class DepositInfoDto implements Dto {

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/2 11:53
- * @Description
+ * @Description 销售订单-主车优惠
  */
 @Data
 public class DiscountDto implements Dto {

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

@@ -8,7 +8,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/2 11:54
- * @Description
+ * @Description 销售订单-主车优惠
  */
 @Data
 public class DiscountInfo implements Dto {

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/2 10:51
- * @Description
+ * @Description 销售订单-主车优惠
  */
 @Data
 public class DiscountListVo implements Vo {

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

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * @Author dimengzhe
  * @Date 2022/6/2 13:55
- * @Description
+ * @Description 销售订单-主车优惠
  */
 @Data
 public class DiscountVo implements Vo {

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

@@ -8,7 +8,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/6 17:22
- * @Description
+ * @Description 销售订单-保险说明
  */
 @Data
 public class InsuranceInfoDto implements Dto {

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/6 17:20
- * @Description
+ * @Description 销售订单-保险说明
  */
 @Data
 public class InsuranceInfoVo implements Vo {

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

@@ -3,12 +3,11 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @Author dimengzhe
  * @Date 2022/6/8 10:45
- * @Description
+ * @Description 移动端-销售订单-虚拟订单订车列表查询条件
  */
 @Data
 public class DepositListQuery implements Query {

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

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 /**
  * @Author dimengzhe
  * @Date 2022/5/31 17:13
- * @Description
+ * @Description 移动端-销售订单-车型信息
  */
 @Data
 public class ModelDto implements Dto {

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

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * @Author dimengzhe
  * @Date 2022/5/31 17:14
- * @Description
+ * @Description 移动端-销售订单-车型信息
  */
 @Data
 public class OrderInfoDto implements Dto {

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

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:05
+ * @Description
+ */
+@Data
+public class OrderDepositInfoVo implements Vo {
+    private static final long serialVersionUID = -6588818888534142465L;
+    @ApiModelProperty(value = "单台订金")
+    private String deposit;
+    @ApiModelProperty(value = "订金合计")
+    private String depositTotal;
+    @ApiModelProperty(value = "订金备注")
+    private String depositRemarks;
+}

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

@@ -0,0 +1,60 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 14:56
+ * @Description 移动端销售订单详情
+ */
+@Data
+public class OrderDetailsVo implements Vo {
+    private static final long serialVersionUID = 3824138856793171263L;
+    @ApiModelProperty(value = "合同编号")
+    private String contractId;
+    @ApiModelProperty(value = "制单日期")
+    private String orderDate;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+    @ApiModelProperty(value = "客户头像")
+    private String customerImage;
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+    @ApiModelProperty(value = "客户电话")
+    private String phone;
+    @ApiModelProperty(value = "客户类型")
+    private String customerKey;
+    @ApiModelProperty(value = "订单类型")
+    private String orderType;
+    @ApiModelProperty(value = "挂靠公司")
+    private String affiliated;
+    @ApiModelProperty(value = "开票类型")
+    private String invoiceType;
+    @ApiModelProperty(value = "销售机构")
+    private String salesOrg;
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    @ApiModelProperty(value = "销售专员")
+    private String sellerName;
+    @ApiModelProperty(value = "保险信息")
+    private String insuranceInfo;
+    @ApiModelProperty(value = "总优惠")
+    private String totaldiscount;
+    @ApiModelProperty(value = "补充说明")
+    private String addRemarks;
+    @ApiModelProperty(value = "车型信息")
+    private OrderModelInfoVo modelInfo;
+    @ApiModelProperty(value = "价格信息")
+    private OrderPriceInfoVo priceInfo;
+    @ApiModelProperty(value = "上装信息")
+    private OrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "主车优惠")
+    private List<OrderDiscountListVo> discountList;
+    @ApiModelProperty(value = "订金信息")
+    private OrderDepositInfoVo depositInfo;
+
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 16:02
+ * @Description
+ */
+@Data
+public class OrderDiscountListVo implements Vo {
+    private static final long serialVersionUID = -4266703223623523971L;
+    @ApiModelProperty(value = "优惠名称")
+    private String discountName;
+    @ApiModelProperty(value = "价值")
+    private String price;
+    @ApiModelProperty(value = "说明")
+    private String explain;
+    @ApiModelProperty(value = "数量")
+    private String number;
+    @ApiModelProperty(value = "总价值")
+    private String total;
+}

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

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 15:45
+ * @Description 销售订单详情-车型信息
+ */
+@Data
+public class OrderModelInfoVo implements Vo {
+    private static final long serialVersionUID = -7281495389286141652L;
+    @ApiModelProperty(value = "车型图片")
+    private String modelImage;
+    @ApiModelProperty(value = "车型名称")
+    private String modelName;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+    private String brand;
+    private String price;
+    @ApiModelProperty(value = "类型")
+    private String type;
+    @ApiModelProperty(value = "车架号")
+    private List<String> vinList;
+    @ApiModelProperty(value = "采购订单编号")
+    private List<String> orderList;
+    @ApiModelProperty(value = "合计数量")
+    private String total;
+}

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 15:58
+ * @Description
+ */
+@Data
+public class OrderPriceInfoVo implements Vo {
+    private static final long serialVersionUID = -3487760224117936621L;
+    @ApiModelProperty(value = "主车成交价")
+    private String transactionPrice;
+    @ApiModelProperty(value = "台数")
+    private String number;
+
+    @ApiModelProperty(value = "车价合计")
+    private String totalPrice;
+    @ApiModelProperty(value = "预计提车日期")
+    private String date;
+    @ApiModelProperty(value = "预计提车地点")
+    private String address;
+}

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/8 9:49
- * @Description
+ * @Description 移动端销售订单补充说明
  */
 @Data
 public class OrderRemarksDto implements Dto {

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/9 13:40
- * @Description
+ * @Description 移动端-销售订单-确认提交
  */
 @Data
 public class OrderSubmitInfoVo implements Vo {

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 15:55
+ * @Description 销售订单详情-上装信息
+ */
+@Data
+public class OrderTopInfoVo implements Vo {
+    private static final long serialVersionUID = 4682350259861289455L;
+    /**
+     * 拼接字段：委改方式：小委改、委改厂：第三委改厂、外廓尺寸：7.8m*3m、板材厚度：5cm、板材材料：合金材质、公告型号：T-B123456
+     * 字段为null或者“” 时 不拼接
+     */
+    @ApiModelProperty(value = "上装信息")
+    private String topBean;
+    @ApiModelProperty(value = "合同附件")
+    private List<String> contractImages;
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/6 10:40
- * @Description
+ * @Description 销售订单-价格信息
  */
 @Data
 public class PriceDto implements Dto {

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

@@ -7,7 +7,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/6/2 16:54
- * @Description
+ * @Description 销售订单价格信息
  */
 @Data
 public class PriceVo implements Vo {

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

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * @Author dimengzhe
  * @Date 2022/6/1 16:02
- * @Description 上装信息
+ * @Description 销售订单-上装信息
  */
 @Data
 public class TopDto implements Dto {

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

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * @Author dimengzhe
  * @Date 2022/6/1 16:50
- * @Description
+ * @Description 销售订单-上装信息
  */
 @Data
 public class TopVo implements Vo {

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

@@ -8,7 +8,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/5/31 17:19
- * @Description
+ * @Description 销售订单-车辆信息
  */
 @Data
 public class VehicleDto implements Dto {

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

@@ -8,7 +8,7 @@ import lombok.Data;
 /**
  * @Author dimengzhe
  * @Date 2022/5/31 17:23
- * @Description
+ * @Description 销售订单-采购订单
  */
 @Data
 public class VehicleOrderDto implements Dto {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
@@ -39,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -277,4 +279,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getSubmitInfo(sid);
     }
 
+    @Override
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail(String sid) {
+        return appBusSalesOrderService.getSaleOrderDetail(sid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -26,12 +26,13 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.db.sql.Order;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
@@ -65,6 +66,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
@@ -369,4 +371,8 @@ public class AppBusSalesOrderService {
         BeanUtil.copyProperties(vo, v);
         return rb.success().setData(v);
     }
+
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail(String sid) {
+        return null;
+    }
 }