From 8142721872caa1f15a68ec6582f73b1bac868cdb Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 11 Jun 2024 10:10:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A2=84=E8=AE=A1=E4=BA=A4=E4=BB=98=E5=9C=B0=E7=82=B9=20?=
 =?UTF-8?q?=E6=96=B0=E8=BD=A6=E4=B9=B0=E5=8D=96=E5=90=88=E5=90=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=BD=A6=E8=BE=86=E4=BA=A4=E4=BB=98=E5=9C=B0=E7=82=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9=E5=B8=82=E3=80=81?=
 =?UTF-8?q?=E5=8C=BA/=E5=8E=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commoncontract/CommonContractService.java | 44 +++++++++++++++++--
 .../bussalesorder/BusSalesOrderService.java   |  6 +++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 5e5e434c0f..debeee63a8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -974,7 +974,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("depositTotal", depositTotal);
         }
         //车辆交付地点
-        map.put("address", appBusSalesOrderPriceVo.getAddress());
+        if (StringUtils.isNotBlank(appBusSalesOrderPriceVo.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(appBusSalesOrderPriceVo.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                map.put("address", scmWarehouseVo.getCity() + scmWarehouseVo.getCounty());
+            }else {
+                map.put("address", "暂无市、区/县");
+            }
+        }else {
+            map.put("address", "暂无预计交付地点");
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -1157,7 +1166,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("depositTotal", depositTotal);
         }
         //车辆交付地点
-        map.put("address", appBusSalesOrderPriceVo.getAddress());
+        if (StringUtils.isNotBlank(appBusSalesOrderPriceVo.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(appBusSalesOrderPriceVo.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                map.put("address", scmWarehouseVo.getCity() + scmWarehouseVo.getCounty());
+            }else {
+                map.put("address", "暂无市、区/县");
+            }
+        }else {
+            map.put("address", "暂无预计交付地点");
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -1969,7 +1987,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("depositTotal", depositTotal);
         }
         //车辆交付地点
-        map.put("address", appBusSalesOrderPriceVo.getAddress());
+        if (StringUtils.isNotBlank(appBusSalesOrderPriceVo.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(appBusSalesOrderPriceVo.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                map.put("address", scmWarehouseVo.getCity() + scmWarehouseVo.getCounty());
+            }else {
+                map.put("address", "暂无市、区/县");
+            }
+        }else {
+            map.put("address", "暂无预计交付地点");
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -2131,7 +2158,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("depositTotal", depositTotal);
         }
         //车辆交付地点
-        map.put("address", appBusSalesOrderPriceVo.getAddress());
+        if (StringUtils.isNotBlank(appBusSalesOrderPriceVo.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(appBusSalesOrderPriceVo.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                map.put("address", scmWarehouseVo.getCity() + scmWarehouseVo.getCounty());
+            }else {
+                map.put("address", "暂无市、区/县");
+            }
+        }else {
+            map.put("address", "暂无预计交付地点");
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
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 4e1051ec69..788670b308 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
@@ -3916,6 +3916,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (vo.getModelInfo() != null) {
                 priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
             }
+            if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())){
+                ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
+                if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                    priceInfo.setAddress(priceInfo.getAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+                }
+            }
             if (appOrderTrailerInfoVos.size() == 1){
                 priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
                 priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());

From ace426fce62de921083ca872b3b47245fde29993 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 11 Jun 2024 10:20:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?pc=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E5=9C=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java   | 6 ++++++
 1 file changed, 6 insertions(+)

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 788670b308..01a7bd28cd 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
@@ -709,6 +709,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         /*************************************************价格信息*****************************************************/
         BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(entity.getSid());
+        if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getPlannedPickUpLocationKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(busSalesOrderPriceDetailsVo.getPlannedPickUpLocationKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                busSalesOrderPriceDetailsVo.setPlannedPickUpLocation(busSalesOrderPriceDetailsVo.getPlannedPickUpLocation() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+            }
+        }
         //计算单台折让
        /* BigDecimal bigDecimalSing = new BigDecimal("0");
         if (busSalesOrderPriceDetailsVo != null) {