From 624e03e9e91b1d12e7609bbb214a387cfadcec82 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 9 Nov 2022 16:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=91=8A=E5=9E=8B=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8C=85=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/buscenter/api/bussalesorder/BusSalesOrder.java   | 5 +++++
 .../bussalesorder/app/order/AppBusSalesOrderAllDto.java    | 5 +++++
 .../app/order/AppBusSalesOrderBillInfoVo.java              | 5 +++++
 .../api/bussalesorder/app/order/AppBusSalesOrderVo.java    | 3 +++
 .../api/bussalesorder/app/order/AppOrderDetailsVo.java     | 3 +++
 .../api/bussalesorder/app/order/AppOrderModelInfoVo.java   | 3 +++
 .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml    | 7 +++++--
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java  | 5 +++--
 .../biz/bussalesordermodel/BusSalesOrderModelMapper.xml    | 3 ++-
 .../api/autoservice/saleOrders/model/ModelDto.java         | 1 +
 .../api/autoservice/saleOrders/order/BusOrderSalesVo.java  | 3 +++
 .../autoservice/saleOrders/order/BusOrerSalesAllDto.java   | 5 +++++
 .../saleOrders/order/BusSalesOrderBillInfoVo.java          | 5 +++++
 .../api/autoservice/saleOrders/order/OrderDetailsVo.java   | 3 +++
 .../api/autoservice/saleOrders/order/OrderModelInfoVo.java | 3 +++
 15 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
index 080926dea7..0c8a869505 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
@@ -121,4 +121,9 @@ public class BusSalesOrder extends BaseEntity {
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+
+    @ApiModelProperty("是否包牌：1是，0否")
+    private String licensePlateKey;
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java
index c814e1b876..49f1ac217a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java
@@ -61,4 +61,9 @@ public class AppBusSalesOrderAllDto implements Dto {
     @ApiModelProperty(value = "意向车型sid")
     private String intentionSid;
 
+    @ApiModelProperty("是否包牌：1是，0否")
+    private String licensePlateKey;
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java
index ddcb686293..f33ada737a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java
@@ -59,4 +59,9 @@ public class AppBusSalesOrderBillInfoVo implements Vo {
     @ApiModelProperty(value = "金融方案value")
     private String financePlanValue;
 
+    @ApiModelProperty("是否包牌：1是，0否")
+    private String licensePlateKey;
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
index ffbcd28b3d..bbce8dc936 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
@@ -145,4 +145,7 @@ public class AppBusSalesOrderVo implements Vo {
     private String makeUpDeposit;
     @JsonIgnore
     private String type;
+
+    @ApiModelProperty("是否显示终止订单按钮")
+    private boolean showStopBtn;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
index e5659c2c2f..7e114285f9 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
@@ -91,4 +91,7 @@ public class AppOrderDetailsVo implements Vo {
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
index b620b25629..220013b9a8 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
@@ -39,4 +39,7 @@ public class AppOrderModelInfoVo implements Vo {
     private String config;
 
     private String specialInstructions;
+
+    @ApiModelProperty("公告型号")
+    private String publicModel;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index 02cf9b0eba..68d9e1dfa8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -102,7 +102,9 @@
                affiliatedCompany,
                affiliatedCompanySid as affiliatedOrgSid,
                financePlan,
-               financePlanValue
+               financePlanValue,
+               licensePlateKey,
+               licensePlateValue
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>
@@ -196,7 +198,8 @@
                bo.billNo,
                bo.financePlanValue,
                bo.payTypeKey,
-               bo.useOrgSid
+               bo.useOrgSid,
+               bo.licensePlateValue
         from bus_sales_order bo
         where sid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 66842b6438..a0ae2bff14 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -1257,6 +1257,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            record.setShowStopBtn(false);
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
                 record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
             }
@@ -1738,8 +1739,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
 
         }
-        orderInfo.setPublicModel(appBusSaleOrderInitModelInfoQuery.getPublicModel());
-        orderInfo.setPublicModelSid(appBusSaleOrderInitModelInfoQuery.getPublicModelSid());
+       /* orderInfo.setPublicModel(appBusSaleOrderInitModelInfoQuery.getPublicModel());
+        orderInfo.setPublicModelSid(appBusSaleOrderInitModelInfoQuery.getPublicModelSid());*/
 
 
         vo.setOrderInfo(orderInfo);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
index f808eeeacb..4f84286292 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
@@ -64,7 +64,8 @@
                    when 2 then '1'
                    when 3 then '2' end as type,
                bp.quantity             as total,
-        bm.specialConfig as specialInstructions
+        bm.specialConfig as specialInstructions,
+        bm.publicModel
         from bus_sales_order_model bm
                  left join bus_sales_order bo on bm.salesOrderSid = bo.sid
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java
index d30dccef8c..fdb6b7bcaf 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java
@@ -38,4 +38,5 @@ public class ModelDto implements Dto {
     private String guildPrice;
 
 
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
index 5269d18f5d..5bf2e287d4 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
@@ -105,4 +105,7 @@ public class BusOrderSalesVo implements Vo {
     @ApiModelProperty(value = "需补交订金")
     @JsonSerialize(using = ToStringSerializer.class)
     private String makeUpDeposit;
+
+    @ApiModelProperty("是否显示终止订单按钮")
+    private boolean showStopBtn;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java
index 55156aee15..02dbaddc26 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java
@@ -65,4 +65,9 @@ public class BusOrerSalesAllDto implements Dto {
 
     @ApiModelProperty(value = "意向车型sid")
     private String intentionSid;
+
+    @ApiModelProperty("是否包牌：1是，0否")
+    private String licensePlateKey;
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java
index 06ae1faa3d..e55610ba4b 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java
@@ -63,4 +63,9 @@ public class BusSalesOrderBillInfoVo implements Vo {
 
     @ApiModelProperty(value = "金融方案value")
     private String financePlanValue;
+
+    @ApiModelProperty("是否包牌：1是，0否")
+    private String licensePlateKey;
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
index 434c6b42cb..9c634358fa 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
@@ -81,4 +81,7 @@ public class OrderDetailsVo implements Vo {
     @JsonProperty("payType")
     private String payTypeKey;
 
+    @ApiModelProperty("是否包牌")
+    private String licensePlateValue;
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java
index 14ca66502c..d6eef93b9f 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java
@@ -34,4 +34,7 @@ public class OrderModelInfoVo implements Vo {
     private String total;
 
     private String specialInstructions;
+
+    @ApiModelProperty("公告型号")
+    private String publicModel;
 }