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} @@ -196,7 +198,8 @@ bo.billNo, bo.financePlanValue, bo.payTypeKey, - bo.useOrgSid + bo.useOrgSid, + bo.licensePlateValue from bus_sales_order bo where sid = #{sid} 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 page = PagerUtil.queryToPage(pq); IPage 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