From 8084ae230a7d871e30dc858b2b409cd5867bb47f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 15 Jun 2022 11:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF-=E8=B0=83=E5=BC=8F?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E6=84=8F=E5=90=91=E8=BD=A6=E5=9E=8B=E3=80=81=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=AD=E8=BD=A6=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehmodelConfigFeign.java                   |  2 +-
 .../BaseVehmodelConfigFeignFallback.java           |  2 +-
 .../BaseVehmodelConfigMapper.java                  |  2 +-
 .../BaseVehmodelConfigMapper.xml                   |  1 +
 .../basevehmodelconfig/BaseVehmodelConfigRest.java |  4 ++--
 .../BaseVehmodelConfigService.java                 |  4 ++--
 .../app/AppBusMainDepositOrderVo.java              |  2 ++
 .../api/busmaindeposit/pc/PcBusMainDepositVo.java  |  2 ++
 .../biz/busmaindeposit/BusMainDepositMapper.xml    |  6 ++++--
 .../biz/busmaindeposit/BusMainDepositService.java  |  6 ++++--
 .../AppOrderCrmVehicleDemandVo.java                |  2 ++
 .../crmvehicledemand/pc/PcCrmVehicleDemandVo.java  |  3 +++
 .../crmvehicledemand/CrmVehicledemandMapper.xml    | 14 ++++++++++----
 .../crmvehicledemand/CrmVehicledemandService.java  | 13 +++++++++----
 14 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
index 249b9333dc..15ec6eb7cd 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
@@ -99,7 +99,7 @@ public interface BaseVehmodelConfigFeign {
      */
     @ApiOperation("根据车型sid和配置sid查询信息")
     @GetMapping("selectOne")
-    ResultBean<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid);
+    ResultBean<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid, @RequestParam(value = "orgSid") String orgSid);
 
     /***************************************************** App接口 **********************************************************/
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
index a13ddc17f5..e6bafd9fee 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
@@ -83,7 +83,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
     }
 
     @Override
-    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid,String orgSid) {
         return null;
     }
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
index 4486a256c9..50addfb761 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
@@ -117,7 +117,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     BaseVehmodelConfigVo fetchAllBySid(String sid);
 
-    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("orgSid")String orgSid);
 
     AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index e271f19131..3937fd0a1a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -217,6 +217,7 @@
                  left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
         where bvc.modelSid = #{modelSid}
           and bvc.configurationItemsSid = #{configSid}
+          and bvc.useOrgSid = #{orgSid}
     </select>
     <select id="selectCarConfigSummary"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
index c86dd924ff..f82a2d502e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
@@ -115,8 +115,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
     }
 
     @Override
-    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
-        return baseVehmodelConfigService.selectOne(modelSid, configSid);
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid,String orgSid) {
+        return baseVehmodelConfigService.selectOne(modelSid, configSid,orgSid);
     }
 
     /**
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index dd0e29c074..eb2658a6c7 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -468,9 +468,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return baseMapper.fetchAllBySid(sid);
     }
 
-    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid, String orgSid) {
         ResultBean<BaseVehmodelVo> rb = ResultBean.fireFail();
-        BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
+        BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid, orgSid);
         if (vo == null) {
             return rb.setData(new BaseVehmodelVo());
         }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java
index c293656263..7b2b1b2081 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderVo.java
@@ -15,6 +15,8 @@ import java.util.List;
 public class AppBusMainDepositOrderVo implements Vo {
     private static final long serialVersionUID = 8636951990438081565L;
 
+    @ApiModelProperty(value = "staffSid")
+    private String staffSid;
     @ApiModelProperty(value = "虚拟订单sid")
     private String virtualSid;
 
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
index fb5d163eb6..4705ae1a0c 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
@@ -40,5 +40,7 @@ public class PcBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "更多配置")
     private String otherConfig;
 
+    private String staffSid;
+
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
index 734d5baf05..b1081077be 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@@ -204,7 +204,8 @@
                bv.modelName        as modelAlias,
                bv.modelotherConfig as config,
                bv.modelSid,
-               bv.modelConfigSid
+               bv.modelConfigSid,
+               bd.staffSid
         from bus_main_deposit bd
                  left join bus_deposit_vehicle_customer bc
                            on bc.billSid = bd.sid
@@ -287,7 +288,8 @@
         select bd.sid            as virtualSid,
                bd.billNo         as virtualId,
                bc.customerName,
-               bc.customerMobile as mobile
+               bc.customerMobile as mobile,
+               bd.staffSid
         from bus_main_deposit bd
                  left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
         <where>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 4086e9e1b0..202ccb4ba9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1536,8 +1536,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 if (list.get(i) != null) {
+                    String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(list.get(i).getStaffSid()).getData();
                     //根据车型sid及配置sid查询单台指导价
-                    ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                    ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid(), orgSid);
                     if (voResultBean.getSuccess()) {
                         list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                         list.get(i).setModelName(voResultBean.getData().getModelName());
@@ -1626,8 +1627,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     for (AppDepositModelListVo v : voList) {
                         String modelSid = v.getModelSid();
                         String configSid = v.getConfigSid();
+                        String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(vo.getStaffSid()).getData();
                         //根据车型sid及配置sid查询单台指导价
-                        ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(modelSid, configSid);
+                        ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(modelSid, configSid, orgSid);
                         if (voResultBean.getSuccess()) {
                             v.setPrice(voResultBean.getData().getGuidedPrice());
                         }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java
index 463dc5912c..75cd72d7bf 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java
@@ -8,6 +8,8 @@ import lombok.Data;
 public class AppOrderCrmVehicleDemandVo implements Vo {
 
     private static final long serialVersionUID = 141976458932283317L;
+    @ApiModelProperty(value = "staffSid")
+    private String staffSid;
     @ApiModelProperty("意向sid")
     private String sid;
 
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
index 0c9a005ebf..552e62d31d 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
@@ -37,4 +37,7 @@ public class PcCrmVehicleDemandVo implements Vo {
     private String otherConfig;
     @ApiModelProperty(value = "单台指导价")
     private String guidedPrice;
+
+    @ApiModelProperty(value = "staffSid")
+    private String staffSid;
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
index c9d3b2e03e..67edcc88f6 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
@@ -124,8 +124,11 @@
                cv.comonConfigSid as   modelConfigSid,
                cv.modelName           modelAlias,
                cv.sketChconfiguration config,
-               cv.brandName
-        from crm_vehicledemand cv ${ew.customSqlSegment}
+               cv.brandName,
+               cct.staffSid
+        from crm_vehicledemand cv
+                 left join crm_customer_temp cct on cct.sid = cv.customerSid
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getWantCarList" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo">
@@ -135,8 +138,11 @@
                cv.modelName,
                cv.brandName,
                cv.createTime,
-               cv.otherConfig    as specialExplain
-        from crm_vehicledemand cv ${ew.customSqlSegment}
+               cv.otherConfig    as specialExplain,
+               cct.staffSid
+        from crm_vehicledemand cv
+                 left join crm_customer_temp cct on cct.sid = cv.customerSid
+            ${ew.customSqlSegment}
     </select>
 
     <update id="updateByPrice">
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
index 87dd2040c1..50e41f9249 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@@ -16,6 +16,7 @@ import com.yxt.anrui.crm.api.crmvehicledemand.pc.PcCrmVehicleDemandVo;
 import com.yxt.anrui.crm.api.crmvehiclefinance.AppCrmVehicleFinanceVo;
 import com.yxt.anrui.crm.biz.crmfindemand.CrmFindemandService;
 import com.yxt.anrui.crm.biz.crmvehiclefinance.CrmVehicleFinanceService;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -58,6 +59,8 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
 
     @Autowired
     private CrmFindemandService crmFindemandService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<CrmVehicledemand> listPage(PagerQuery<CrmVehicledemandQuery> pq) {
         CrmVehicledemandQuery query = pq.getParams();
@@ -360,7 +363,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         }
         baseMapper.updateById(entity);
         if (StringUtils.isBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
-           baseMapper.updateByPrice(entity.getSid());
+            baseMapper.updateByPrice(entity.getSid());
         }
         return rb.success();
     }
@@ -392,7 +395,8 @@ 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).getModelConfigSid());
+                String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(list.get(i).getStaffSid()).getData();
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid(), orgSid);
                 if (voResultBean.getSuccess()) {
                     list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                     list.get(i).setModelName(voResultBean.getData().getModelName());
@@ -439,8 +443,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         List<AppOrderCrmVehicleDemandVo> list = p.getRecords();
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
+                String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(list.get(i).getStaffSid()).getData();
                 //根据车型sid及配置sid查询单台指导价
-                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getConfigSid());
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getConfigSid(), orgSid);
                 if (voResultBean.getSuccess()) {
                     list.get(i).setGuidancePrice(voResultBean.getData().getGuidedPrice());
                 }
@@ -461,7 +466,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             qw.eq("cv.customerSid", query.getCustomerSid());
         }
         //是否意向：0非意向，1意向
-        qw.eq("states",1);
+        qw.eq("states", 1);
         return qw;
     }
 }
\ No newline at end of file