销售订单详情接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.busdepositfictitious;
 
 
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDepositFictitiousVo.java <br/>
@@ -51,16 +51,17 @@ import java.math.BigDecimal;
 public class BusDepositFictitiousVo implements Vo {
 
     private String sid;
-
-	@ApiModelProperty("虚拟订单编号")
+    @ApiModelProperty("虚拟订单编号")
     private String depositBillNo;
-	@ApiModelProperty("订金信息sid")
+    @ApiModelProperty("订金信息sid")
     private String depositSid;
-	@ApiModelProperty("订金剩余金额")
-    private BigDecimal depositPrice;
-	@ApiModelProperty("本次结转金额")
-    private BigDecimal price;
-	@ApiModelProperty("款项支付委托书")
+    @ApiModelProperty("订金剩余金额")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String depositPrice;
+    @ApiModelProperty("本次结转金额")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String price;
+    @ApiModelProperty("款项支付委托书")
     private String payPath;
 
 }

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

@@ -26,13 +26,21 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleListVo;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -52,7 +60,6 @@ import java.util.Date;
 public class BusSalesOrderDetailsVo implements Vo {
 
     private static final long serialVersionUID = -7574451321354327831L;
-    private String sid;
     @ApiModelProperty("销售部门sid")
     private String orgSid;
     @ApiModelProperty("销售部门")
@@ -67,10 +74,8 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String staffSid;
     @ApiModelProperty("客户联系电话")
     private String mobile;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("制单日期")
-    private Date createDateStart;
-    private Date createDateEnd;
+    private String createDate;
     @ApiModelProperty("开票类型key")
     private String billingTypeKey;
     @ApiModelProperty("开票类型value")
@@ -89,15 +94,26 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String notes;
     @ApiModelProperty("是否包含上装")
     private String isTop;
-    @ApiModelProperty("节点状态")
-    private String nodeState;
-    @ApiModelProperty("流程定义id")
-    private String procDefId;
-    @ApiModelProperty("环节定义id")
-    private String nodeId;
-    @ApiModelProperty("流程实例id")
-    private String procInstId;
     @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
     private String type;
+    
+    @ApiModelProperty(value = "主车车型信息")
+    private BusSalesOrderModelVo busSalesOrderModel;
+    @ApiModelProperty(value = "现车车辆信息")
+    private List<BusSalesOrderVehicleListVo> busSalesOrderVehicleList;
+    @ApiModelProperty(value = "采购订单信息")
+    private List<BusSalesVehicleOrderVo> busSalesVehicleOrderList;
+    @ApiModelProperty(value = "上装配置信息")
+    private BusSalesOrderMakeupVo busSalesOrderMakeup;
+    @ApiModelProperty(value = "价格信息")
+    private BusSalesOrderPriceVo busSalesOrderPrice;
+    @ApiModelProperty(value = "主车优惠明细")
+    private List<BusSalesOrderDiscountVo> busSalesOrderDiscountList;
+    @ApiModelProperty(value = "保险说明")
+    private BusSalesOrderInsuranceVo busSalesOrderInsurance;
+    @ApiModelProperty(value = "订金信息")
+    private BusSalesOrderDepositVo busSalesOrderDeposit;
+    @ApiModelProperty(value = "虚拟订单和订金关联信息")
+    private List<BusDepositFictitiousVo> busDepositFictitiousList;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
 
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositVo.java <br/>
@@ -55,14 +55,17 @@ public class BusSalesOrderDepositVo implements Vo {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty("单台订金")
-    private BigDecimal deposit;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String deposit;
     @ApiModelProperty("订金合计")
-    private BigDecimal depositAll;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String depositAll;
     @ApiModelProperty("订金交纳方式")
     private String depositType;
     @ApiModelProperty("订金交纳方式key")
     private String depositTypeKey;
     @ApiModelProperty("需补交订金")
-    private BigDecimal makeUpDeposit;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String makeUpDeposit;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
 
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderInsuranceVo.java <br/>
@@ -58,7 +58,8 @@ public class BusSalesOrderInsuranceVo implements Vo {
     @ApiModelProperty("保险公司名称")
     private String insuranceName;
     @ApiModelProperty("单台车保费预估金额")
-    private BigDecimal insuranceCarMoney;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
     private Integer insuranceNum;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesordermakeup;
 
 
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMakeupVo.java <br/>
@@ -50,8 +50,7 @@ import java.math.BigDecimal;
 @ApiModel(value = "销售订单-上装配置 视图数据对象", description = "销售订单-上装配置 视图数据对象")
 public class BusSalesOrderMakeupVo implements Vo {
 
-    private String sid;
-
+    private static final long serialVersionUID = 6733914225960964019L;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty("上装名称")
@@ -69,7 +68,8 @@ public class BusSalesOrderMakeupVo implements Vo {
     @ApiModelProperty("公告型号")
     private String announcementModel;
     @ApiModelProperty("上装价格")
-    private BigDecimal topPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String topPrice;
     @ApiModelProperty("更多配置")
     private String moreConfig;
     @ApiModelProperty("合同上传")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesordermodel;
 
 
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelVo.java <br/>
@@ -70,8 +70,10 @@ public class BusSalesOrderModelVo implements Vo {
     @ApiModelProperty("特殊配置说明")
     private String specialConfig;
     @ApiModelProperty("单台指导价")
-    private BigDecimal guildPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guildPrice;
     @ApiModelProperty("单台成交价")
-    private BigDecimal finalPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String finalPrice;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceVo.java

@@ -26,15 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderprice;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderPriceVo.java <br/>
@@ -53,22 +51,22 @@ import java.util.Date;
 public class BusSalesOrderPriceVo implements Vo {
 
     private static final long serialVersionUID = 1408386000498526871L;
-    private String sid;
 
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty("单台指导价（主车加上装）")
-    private BigDecimal singleGuildPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String singleGuildPrice;
     @ApiModelProperty("单台成交价（主车加上装）")
-    private BigDecimal singleFinalPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String singleFinalPrice;
     @ApiModelProperty("台数")
     private Integer quantity;
     @ApiModelProperty("车价合计")
-    private BigDecimal priceSum;
+    private String priceSum;
     @ApiModelProperty("计划提车地点")
     private String plannedPickUpLocation;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("计划提车日期")
-    private Date plannedPickUpDate;
+    private String plannedPickUpDate;
 
 }