Merge remote-tracking branch 'origin/master'

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;
 }

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;
+
 }

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;
+
 }

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;
 }

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;
 }

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;
 }

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>

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);

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

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;
 
 
+
 }

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;
 }

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;
 }

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;
 }

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;
+
 }

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;
 }