销售订单-移动端获取客户意向车型列表、根据车型和配置及用户查询车型信息

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -34,7 +34,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -123,6 +122,6 @@ public interface BaseVehmodelConfigFeign {
 
     @ApiOperation("获取车型配置总结（即常用配置一句话描述）(销售订单)")
     @GetMapping("/selectCarConfigSummary/{modelSid}/{configSid}/{userSid}")
-    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -249,14 +249,18 @@
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrgSid LIKE concat('%', #{orgSid}, '%')
+          AND bvc.useOrgSid = #{orgSid}
     </select>
 
     <select id="getListByConfigSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT * FROM base_vehmodel_config WHERE configurationItemsSid = #{sid}
+        SELECT *
+        FROM base_vehmodel_config
+        WHERE configurationItemsSid = #{sid}
     </select>
 
     <select id="getVehModByModelSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT * FROM base_vehmodel_config WHERE modelSid = #{sid}
+        SELECT *
+        FROM base_vehmodel_config
+        WHERE modelSid = #{sid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -37,7 +37,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -160,8 +159,6 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
 
     @Override
     public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
-        ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
+        return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
-        AppCarConfigSummaryVo vo = baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
-        return rb.success().setData(vo);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -467,11 +467,19 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return rb.success().setData(vo);
     }
 
-    public AppCarConfigSummaryVo selectCarConfigSummary(String modelSid, String configSid, String userSid) {
+    public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
-        String orgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
-        AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, orgSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setData(new AppCarConfigSummaryVo());
+        }
+        AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, resultBean.getData());
+        if (appModelConfigListVo != null) {
             AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
-        return configSummaryVo;
+            return rb.success().setData(configSummaryVo);
+        }
+
+        return rb.setData(new AppCarConfigSummaryVo());
     }
 
     /**

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java

@@ -8,10 +8,10 @@ import lombok.Data;
 public class AppBusSaleOrderInitModelInfoVo implements Vo {
 
     private static final long serialVersionUID = 342793087650993718L;
-    @ApiModelProperty("")
+    @ApiModelProperty("选择的车型信息的数据")
     private AppOrderInfo orderInfo;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("根据车型查询出来的现车和采购订单数据")
     private AppCarInfo carInfo;
 
     @ApiModelProperty("订单sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -32,9 +33,9 @@ public class AppOrderInfo implements Vo {
     private String specialInstructions;
 
     @ApiModelProperty("销售订单-车型确认-现车")
-    private List<AppNowCarList> nowCarList;
+    private List<AppNowCarList> nowCarList = new ArrayList<>();
 
     @ApiModelProperty("销售订单-车型确认-排产")
-    private List<AppReadyCarList> readyCarList;
+    private List<AppReadyCarList> readyCarList = new ArrayList<>();
 
 }

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

@@ -1336,26 +1336,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<AppReadyCar> appReadyCar = new ArrayList<>();
         List<AppNowCarList> appNowCarLists = new ArrayList<>();
         List<AppReadyCarList> appReadyCarLists = new ArrayList<>();
-
         AppNowCar appNowCar = null;
-
+        //根据车型及配置查询车型信息
         ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid);
         AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData();
-        //现车
-        List<AppVinsDetailsVo> appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData();
-        //排产
-        List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
-
-        orderInfo.setNotice("提示");
         orderInfo.setModelSid(modelSid);
         orderInfo.setModelName(data.getModel());
         orderInfo.setConfigSid(configSid);
         orderInfo.setCommonlyConfig(data.getConfig());
         orderInfo.setMoreConfig(data.getMoreConfig());
-        orderInfo.setModelName(special);
+        orderInfo.setSpecialInstructions(special);
         orderInfo.setNowCarList(appNowCarLists);
         orderInfo.setReadyCarList(appReadyCarLists);
-
+        vo.setOrderInfo(orderInfo);
+        //现车
+        List<AppVinsDetailsVo> appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData();
+        //排产
+        List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
         //现车
         if (appNowCarVos.size() > 0) {
             for (AppVinsDetailsVo appNowCarVo : appNowCarVos) {
@@ -1372,9 +1369,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //排产
         BeanUtil.copyProperties(appReadyCar, appOrderReadyCars);
         vo.setCarInfo(appCarInfo);
-        vo.setOrderInfo(orderInfo);
         appCarInfo.setReadyCar(appReadyCar);
-
         return vo;
     }
 

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppOrderCrmVehicleDemandVo implements Vo {
 
+    private static final long serialVersionUID = 141976458932283317L;
     @ApiModelProperty("意向sid")
     private String sid;
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -129,9 +129,10 @@
     </select>
 
     <select id="getWantCarList" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo">
-        select cv.modelSid,
+        select cv.sid,
+               cv.modelSid,
                cv.comonConfigSid as configSid,
-               cv.modelAlias     as modelName,
+               cv.modelName,
                cv.brandName,
                cv.createTime
         from crm_vehicledemand cv ${ew.customSqlSegment}
@@ -143,5 +144,4 @@
         set vehicleModelOffer = NULL
         where sid = #{sid}
     </update>
-
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -30,7 +30,6 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * Project: anrui-crm(客户管理) <br/>
@@ -441,7 +440,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 //根据车型sid及配置sid查询单台指导价
-                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelSid());
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getConfigSid());
                 if (voResultBean.getSuccess()) {
                     list.get(i).setGuidancePrice(voResultBean.getData().getGuidedPrice());
                 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@@ -83,4 +83,15 @@ public interface SysStaffOrgFeign {
     @ResponseBody
     @ApiModelProperty("根据员工sid获取主管部门信息")
     ResultBean<SysStaffOrg> selectAllByStaffSid(@RequestParam(value = "staffSid") String staffSid);
+
+    /**
+     * 根据用户sid获取分公司sid
+     *
+     * @param applySid 用户sid
+     * @return
+     */
+    @GetMapping("/getPathSidByUserSid")
+    @ResponseBody
+    @ApiModelProperty("根据员工sid获取部门全路径")
+    ResultBean<String> getPathSidByUserSid(@RequestParam(value = "userSid") String applySid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java

@@ -89,4 +89,9 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
 	public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getPathSidByUserSid(String applySid) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java

@@ -120,4 +120,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
     public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
         return sysStaffOrgService.selectAllByStaffSid(staffSid);
     }
+
+    @Override
+    public ResultBean<String> getPathSidByUserSid(String applySid) {
+        return sysStaffOrgService.getPathSidByUserSid(applySid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -4,9 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.*;
+import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
+import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -37,6 +38,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
 
     @Autowired
     private SysOrganizationService sysOrganizationService;
+    @Autowired
+    private SysUserService sysUserService;
 
     public PagerVo<SysStaffOrg> listPage(PagerQuery<SysStaffOrgQuery> pq) {
         SysStaffOrgQuery query = pq.getParams();
@@ -194,4 +197,20 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public SysStaffOrg getOrgByStaffSid(String sid) {
         return baseMapper.getOrgByStaffSid(sid);
     }
+
+    /**
+     * 根据用户sid获取分公司sid
+     *
+     * @param applySid 用户sid
+     * @return
+     */
+    public ResultBean<String> getPathSidByUserSid(String applySid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(applySid);
+        if (sysUserInfoVo == null) {
+            return rb;
+        }
+        ResultBean<String> resultBean = selectSidPathByStaffSid(sysUserInfoVo.getStaffSid());
+        return resultBean;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -96,4 +98,8 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
 
+    @ApiOperation("获取客户意向车型列表")
+    @PostMapping("/init/wantCarList")
+    @ResponseBody
+    ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(@RequestBody PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -81,4 +83,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -102,4 +104,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
+        return appBusSalesOrderService.getWantCarList(pagerQuery);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
+import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -53,6 +56,8 @@ public class AppBusSalesOrderService {
 
     @Autowired
     BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private CrmVehicledemandFeign crmVehicledemandFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -125,7 +130,7 @@ public class AppBusSalesOrderService {
      * @return
      */
     public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
+        ResultBean<AppBusSaleOrderInitModelInfoVo> resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
         return resultBean;
     }
 
@@ -142,4 +147,8 @@ public class AppBusSalesOrderService {
     }
 
 
+    public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
+        ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> resultBean = crmVehicledemandFeign.getWantCarList(pagerQuery);
+        return resultBean;
+    }
 }