移动端销售订单完善及pc端销售订单完善

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java

@@ -22,7 +22,7 @@ public class PcBaseVehicleOrderCountQuery implements Query {
     @ApiModelProperty(value = "客户sid")
     private String customerSid;
 
-    @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
-    private Integer type;
+/*    @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
+    private Integer type;*/
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -1,8 +1,6 @@
 package com.yxt.anrui.base.api.basevehiclemodel;
 
-import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
@@ -40,6 +38,7 @@ public interface BaseVehicleModelFeign {
     /**
      * 分页查询
      * listPageByVehmodel
+     *
      * @param pagerQuery
      * @return
      */
@@ -203,4 +202,7 @@ public interface BaseVehicleModelFeign {
     @PostMapping("/selectVehModelByConfigSid")
     public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery);
 
+    @ApiOperation("根据车型sid查询车型信息")
+    @GetMapping("/selectDetails/{modelSid}")
+    ResultBean<BaseVehicleModel> selectDetails(@PathVariable(value = "modelSid") String modelSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.base.api.basevehiclemodel;
 
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
@@ -111,6 +110,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        return null;
+    }
+
 
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1318,7 +1318,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (query != null) {
             qw.eq("bv.modelSid", query.getModelSid());//车型sid
             qw.eq("bv.modelConfigSid", query.getModelConfigSid());//配置sid
-            if (query.getType() == 2) {
+            String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid()).getData();
+            qw.eq("bv.useOrg", orgSid);
+            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+           /* if (query.getType() == 2) {
                 //根据业务员sid和客户sid查询所有的虚拟虚拟订单的车辆
                 PcBusMainDepositVehicleQuery vehicleQuery = new PcBusMainDepositVehicleQuery();
                 vehicleQuery.setCustomerSid(query.getCustomerSid());
@@ -1329,7 +1332,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 if (stringList.getSuccess()) {
                     qw.in("bv.sid", stringList.getData());
                 }
-            }
+            }*/
         }
         int count = baseMapper.selectVehicleCount(qw);
         return rb.success().setData(count);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.*;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
-import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
@@ -279,6 +278,11 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        return baseVehicleModelService.selectDetails(modelSid);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -612,4 +612,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public int checkByCreateOrgAndModelSid(String sid1, String sid) {
         return baseMapper.checkByCreateOrgAndModelSid(sid1, sid);
     }
+
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        ResultBean<BaseVehicleModel> rb = ResultBean.fireFail();
+        BaseVehicleModel baseVehicleModel = fetchBySid(modelSid);
+        if (baseVehicleModel == null) {
+            return rb.setData(new BaseVehicleModel());
+        }
+        return rb.success().setData(baseVehicleModel);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java

@@ -50,9 +50,7 @@ import lombok.Data;
 @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情")
 public class BusSalesOrderModelDetailsVo implements Vo {
 
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
+    private static final long serialVersionUID = -6137096646061858887L;
     @ApiModelProperty("车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -290,6 +290,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if ("1".equals(entity.getIsTop())) {
             BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(entity.getSid());
             if (busSalesOrderMakeupDetailsVo != null) {
+                if (StringUtils.isNotBlank(busSalesOrderMakeupDetailsVo.getContractPath())) {
+                    List<String> imageList = Arrays.asList(busSalesOrderMakeupDetailsVo.getContractPath().split(","));
+                    if (!imageList.isEmpty()) {
+                        busSalesOrderMakeupDetailsVo.setContractPath(imageList.get(0));
+                    }
+
+                }
                 vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
             }
         }
@@ -1048,7 +1055,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //查询是否有价格信息
             BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);
             if (priceDetailsVo != null) {
-                if (priceDetailsVo.getSingleFinalPrice() != null) {
+                if (StringUtils.isNotBlank(priceDetailsVo.getSingleFinalPrice()) && StringUtils.isNotBlank(busSalesOrderModelDetailsVo.getFinalPrice())) {
                     vo.setPriceInfoState(1);
                 } else {
                     vo.setPriceInfoState(0);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -21,8 +21,7 @@
                guildPrice,
                finalPrice,
                brandName,
-               brandSid,
-               type
+               brandSid
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@@ -78,6 +80,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BusSalesOrderPriceService busSalesOrderPriceService;
     @Autowired
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
+    @Autowired
+    private BaseVehicleModelFeign baseVehicleModelFeign;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -141,6 +145,16 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             return rb.setMsg("该销售订单单据不存在");
         }
         AppOrderInfoDto orderInfo = dto.getOrderInfo();
+        String brandSid = "";
+        String brandName = "";
+        String modelAlias = "";
+        //根据车型sid查询车型的品牌和品牌名称
+        ResultBean<BaseVehicleModel> resultBean = baseVehicleModelFeign.selectDetails(dto.getOrderInfo().getModelSid());
+        if (resultBean.getSuccess()) {
+            brandSid = resultBean.getData().getCarBrand();
+            brandName = resultBean.getData().getBrandName();
+            modelAlias = resultBean.getData().getModelName();
+        }
         //根据销售订单查询车型信息
         BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(salesOrderSid);
         if (busSalesOrderModel == null) {
@@ -149,11 +163,17 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                 BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
                 busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
                 busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
+                busSalesOrderModel1.setBrandName(brandName);
+                busSalesOrderModel1.setBrandSid(brandSid);
+                busSalesOrderModel1.setModelConfig(modelAlias);
                 save(busSalesOrderModel1);
             }
         } else {
             BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");
             busSalesOrderModel.setGuildPrice(new BigDecimal(dto.getGuildPrice()));
+            busSalesOrderModel.setBrandSid(brandSid);
+            busSalesOrderModel.setBrandName(brandName);
+            busSalesOrderModel.setModelConfig(modelAlias);
             updateById(busSalesOrderModel);
         }
         //删除现车、采购订单的数据、若类型为现车，添加现车数据，若为采购订单，则新增采购订单数据