Merge remote-tracking branch 'origin/master'

1 year ago · 2dfbd510e3
2 changed files with 52 additions and 4 deletions
--- 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();
--- 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) {
@ -3916,6 +3922,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());