From af4d1df437bb23ab12660e267fbf8d3749c3960d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 10 Feb 2023 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bussalesorder/app/order/AppOrderPriceInfoVo.java       | 1 +
 .../buscenter/api/bussalesorderprice/BusSalesOrderPrice.java   | 3 +++
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java      | 3 +++
 .../biz/bussalesorderprice/BusSalesOrderPriceMapper.xml        | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
index fa7970d7b6..bf88a4b8f5 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
@@ -24,6 +24,7 @@ public class AppOrderPriceInfoVo implements Vo {
     private String date;
     @ApiModelProperty(value = "预计提车地点")
     private String address;
+    private String plannedPickUpLocationKey;
 
     @ApiModelProperty("单台整体指导价")
     private String singleGuildPrice;
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
index f0a2e889e3..133af7221e 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
@@ -70,4 +70,7 @@ public class BusSalesOrderPrice extends BaseEntity {
     @ApiModelProperty("计划提车日期")
     private Date plannedPickUpDate;
 
+    @ApiModelProperty("计划提车地点")
+    private String plannedPickUpLocationKey;
+
 }
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 6d48e7fd7f..7a74313b44 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
@@ -2868,6 +2868,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //冷藏冷机
             if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())){
                 topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
+                if(!busSalesOrderMakeup.getRefirgerator().contains("机")){
+                    topMessage = topMessage+"冷机";
+                }
             }
             //自卸液压盖板
             if(StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl())&& !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())){
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
index 6c5d4183ba..31f4c26275 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
@@ -55,7 +55,8 @@
                DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date,
                bp.plannedPickUpLocation                      as address,
                bp.singleGuildPrice,
-               bp.singleFinalPrice
+               bp.singleFinalPrice,
+               bp.plannedPickUpLocationKey
         from bus_sales_order_price bp
         where bp.salesOrderSid = #{sid}
     </select>