From 06c32ebc8dbe5e2d299d9c613d0911461abd715c Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 11 Jun 2024 11:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9=E5=90=8E=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E4=BB=A5=E5=8F=8A=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=BB=B7=E6=A0=BC=E4=BF=A1=E6=81=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppBusSalesOrderPriceVo.java                 |  2 ++
 .../BusSalesOrderPriceService.java                   | 12 ++++++++++++
 .../com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java |  1 +
 .../scm/biz/scmwarehouse/ScmWarehouseService.java    |  7 ++++++-
 .../api/autoservice/saleOrders/price/PriceVo.java    |  2 ++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceVo.java
index 5decb4b101..a469417092 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceVo.java
@@ -15,6 +15,8 @@ public class AppBusSalesOrderPriceVo implements Vo {
 
     @ApiModelProperty(value = "预计提车地点")
     private String address;
+    @ApiModelProperty(value = "预计提车地点全称")
+    private String fullName;
     @ApiModelProperty(value = "预计提车地点")
     private String addressKey;
     @ApiModelProperty(value = "主车单台成交价格")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
index a46e9064ca..f052c5d1f5 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
@@ -39,6 +39,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
@@ -70,6 +72,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
     @Autowired
     private BusSalesOrderModelService busSalesOrderModelService;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     public void saveOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
         BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();
@@ -142,6 +146,14 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         AppBusSalesOrderPriceVo vo1 = baseMapper.getPriceInfo(sid);
         BusSalesOrderModelDetailsVo detailsVo = busSalesOrderModelService.details(sid);
         BeanUtil.copyProperties(vo1, vo);
+        if (StringUtils.isNotBlank(vo1.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(vo1.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                vo.setFullName(vo.getAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+            }else {
+                vo.setFullName(vo.getAddress());
+            }
+        }
         BigDecimal bigDecimalFinalPrice = new BigDecimal("0");
         if(detailsVo == null){
             return rb.setMsg("请先完善车型信息");
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java
index 46ad7a25c6..df315f0241 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java
@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class ScmExtra {
 
+    private String fullName;
     private String name;
     private String sid;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
index 9eb0cf04c5..e78baf9f0c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
@@ -221,10 +221,15 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
                 ScmExtra scmExtra = new ScmExtra();
                 scmExtra.setSid(scmWarVo.getId());
                 scmExtra.setName(scmWarVo.getDictValue());
+                ScmWarehouse scmWarehouse = fetchBySid(scmWarVo.getId());
+                if (StringUtils.isNotBlank(scmWarehouse.getCity()) && StringUtils.isNotBlank(scmWarehouse.getCounty())){
+                    scmExtra.setFullName(scmExtra.getName() + "(" + scmWarehouse.getCity() + scmWarehouse.getCounty() + scmWarehouse.getWarehouseAttribute() + ")");
+                }else {
+                    scmExtra.setFullName(scmExtra.getName());
+                }
                 scmWarVo.setExtra(scmExtra);
             }
         }
-
         return rb.success().setData(list);
     }
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java
index 9d2e53aa76..a55772de1c 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java
@@ -14,6 +14,8 @@ public class PriceVo implements Vo {
     private static final long serialVersionUID = -6281257788690749096L;
     @ApiModelProperty(value = "预计提车地点")
     private String address;
+    @ApiModelProperty(value = "预计提车地点全称")
+    private String fullName;
     @ApiModelProperty(value = "预计提车地点")
     private String addressKey;
     @ApiModelProperty(value = "主车单台成交价格")