移动端选择存放地点后展示详细地址以及初始化价格信息展示详细地址

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 = "主车单台成交价格")

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("请先完善车型信息");

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;
 }

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);
     }
 }

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 = "主车单台成交价格")