From 7806cba9c55af714837f69a426225ccced2a985c Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 25 May 2022 15:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E5=8F=8Apc=E7=AB=AF=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/app/AppBusSalesOrderVo.java | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java
index 7df5fda9be..5a908dc797 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java
@@ -27,6 +27,8 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,35 +56,38 @@ public class AppBusSalesOrderVo implements Vo {
      * 销售订单sid
      */
     @ApiModelProperty("销售订单sid")
-    @JsonProperty("customerImage")
-    private String saleOrderSid;
+    @JsonProperty("saleOrderSid")
+    private String sid;
     /**
      * 销售订单编号
      */
     @ApiModelProperty("销售订单编号")
     @JsonProperty("saleOrderId")
-    private String saleOrderId;
+    private String billNo;
     /**
      * 客户类型
      */
     @ApiModelProperty("客户类型")
+    @JsonProperty("customerClass")
     private String customerType;
     /**
      * 客户sid
      */
     @ApiModelProperty("客户sid")
+    @JsonProperty("customerSid")
     private String customerSid;
     /**
      * 客户名称
      */
     @ApiModelProperty("客户名称")
+    @JsonProperty("customerName")
     private String customerName;
     /**
      * 客户头像
      */
     @ApiModelProperty("客户头像")
     @JsonProperty("customerImage")
-    private String customerImage;
+    private String customerPhoto;
     /**
      * 手机号
      */
@@ -92,17 +97,20 @@ public class AppBusSalesOrderVo implements Vo {
      * 购车方式
      */
     @ApiModelProperty("购车方式")
-    private String carPurchaseType;
+    @JsonProperty("carPurchaseType")
+    private String payType;
     /**
      * 购车方式key
      */
     @ApiModelProperty("购车方式key")
-    private String carPurchaseKey;
+    @JsonProperty("carPurchaseKey")
+    private String payTypeKey;
     /**
      * 销售订单状态
      */
     @ApiModelProperty("销售订单状态")
-    private String saleOrderState;
+    @JsonProperty("saleOrderState")
+    private String nodeState;
     /**
      * 创建日期
      */
@@ -112,11 +120,12 @@ public class AppBusSalesOrderVo implements Vo {
      * 是否保险
      */
     @ApiModelProperty("是否保险")
+    @JsonProperty("insuranceInfo")
     private String insuranceInfo;
     /**
      * 订金
      */
-    @ApiModelProperty("订金")
+    @ApiModelProperty("已交订金")
     private String deposit;
     @ApiModelProperty("是否显示修改订单按钮")
     private boolean showUpdateBtn;
@@ -132,5 +141,15 @@ public class AppBusSalesOrderVo implements Vo {
     private boolean showInputBtn;
 
     @ApiModelProperty("车型信息")
-    private AppModelInfo modelInfo;
+    private AppModelInfoVo modelInfo;
+
+    /**
+     * 页面不需要以下参数，以下参数用来计算
+     */
+    @ApiModelProperty(value = "订金合计")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String depositAll;
+    @ApiModelProperty(value = "需补交订金")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String makeUpDeposit;
 }