From 931b85e40f65c337e59f14a282dba038bcac5be4 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Mon, 27 Apr 2020 14:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=AE=A1=E7=90=86=E9=9B=B6?=
 =?UTF-8?q?=E5=94=AE=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/generalize/service/RetailCompanyService.java   | 11 ++++-------
 .../com/kiisoo/ic/system/entity/PrivilageUserDO.java  |  3 +++
 .../ic/system/mapper/PrivilageUserDOMapper.java       |  5 +++++
 src/main/resources/mapper/PoiStoreDOMapper.xml        |  2 +-
 src/main/resources/mapper/PrivilageUserDOMapper.xml   |  8 ++++++++
 src/main/resources/mapper/RetailCompanyMapper.xml     |  2 +-
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
index 05182ee..7407f15 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -597,17 +597,14 @@ public class RetailCompanyService {
         List<Long> sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId);
         List<SellerOrganizationalVO> list = new ArrayList<>();
 
-        //查询所有的店铺信息
-        QueryWrapper<PrivilageUserDO> poiStoreQueryWrapper = new QueryWrapper<>();
-        poiStoreQueryWrapper.in("id", sellerIds);
-        List<PrivilageUserDO> list2 = privilageUserDOMapper.selectList(poiStoreQueryWrapper);
-
-        Map<Long, PrivilageUserDO> map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getId, p -> p));
+        //查询所有的用户信息
+        List<PrivilageUserDO> list2 = privilageUserDOMapper.selectListPr(sellerIds);
+        Map<Long, PrivilageUserDO> map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getSellerId, p -> p));
 
         //所有的导购客户个数
         List<Map<String, Object>> map1 = opSellerCustomerRelationDOMapper.selectAllCustomer(sellerIds);
         Map<Long, Object> collect = map1 == null ? new HashMap<>() : map1.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("user_id").toString()), m1 -> m1.get("count")));
-
+        //所有的导购有效客户个数
         List<Map<String, Object>> map3 = opSellerCustomerRelationDOMapper.selectAllCustomer1(sellerIds);
         Map<Long, Object> collect1 = map3 == null ? new HashMap<>() : map3.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("user_id").toString()), m1 -> m1.get("count")));
 
diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
index 8562dad..9599ab5 100644
--- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
+++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java
@@ -82,4 +82,7 @@ public class PrivilageUserDO implements Serializable {
      * 修改人
      */
     private String updateBy;
+
+    @TableField(exist = false)
+    private long sellerId;
 }
diff --git a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java
index afb277d..d2bf876 100644
--- a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java
@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kiisoo.ic.system.bean.PrivilageUserBean;
 import com.kiisoo.ic.system.entity.PrivilageRoleDO;
 import com.kiisoo.ic.system.entity.PrivilageUserDO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 用户表  Mapper 接口
  * @author jinchaofan
@@ -19,4 +22,6 @@ public interface PrivilageUserDOMapper extends BaseMapper<PrivilageUserDO> {
     Long selectStoreIdByUserId(Long userId);
 
     PrivilageRoleDO selecctRoleByUserId(long userId);
+
+    List<PrivilageUserDO> selectListPr(@Param("sellerIds") List<Long> sellerIds);
 }
diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml
index b468613..358f1f0 100644
--- a/src/main/resources/mapper/PoiStoreDOMapper.xml
+++ b/src/main/resources/mapper/PoiStoreDOMapper.xml
@@ -29,7 +29,7 @@
         and t3.domain_id = t4.domain_id
         and t4.type = 3
         and t1.store_id = t4.entity_id
-        and t1.user_id = #{sellerId}
+        and t1.id = #{sellerId}
         limit 1
     </select>
     <select id="selectShopByCompany" resultType="com.kiisoo.ic.store.entity.PoiStore">
diff --git a/src/main/resources/mapper/PrivilageUserDOMapper.xml b/src/main/resources/mapper/PrivilageUserDOMapper.xml
index cd39953..227c33e 100644
--- a/src/main/resources/mapper/PrivilageUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageUserDOMapper.xml
@@ -20,6 +20,14 @@
         where t1.role_id = t2.id
         and t1.user_id = #{userId}
     </select>
+    <select id="selectListPr" resultType="com.kiisoo.ic.system.entity.PrivilageUserDO">
+        select t1.*,t2.id as sellerId from privilage_user t1,poi_store_staff t2
+        where t1.id = t2.user_id
+        and t2.id in
+        <foreach collection="sellerIds" separator="," item="item" close=")" index="index" open="(">
+            #{item}
+        </foreach>
+    </select>
 
 
 </mapper>
diff --git a/src/main/resources/mapper/RetailCompanyMapper.xml b/src/main/resources/mapper/RetailCompanyMapper.xml
index 785be27..fa52e2f 100644
--- a/src/main/resources/mapper/RetailCompanyMapper.xml
+++ b/src/main/resources/mapper/RetailCompanyMapper.xml
@@ -26,7 +26,7 @@
         </if>
     </select>
     <select id="selectSellerIdsByShop" resultType="java.lang.Long">
-        select t4.user_id
+        select t4.id
         from privilage_organizational t,
         privilage_organizational t1,
         privilage_organizational_domain t2,