From fd47c31853a8ef80485ff2d0bbd6b2ca78f89e05 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Mon, 27 Apr 2020 16:45:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/store/controller/PoiStoreStaffController.java   |  5 +++--
 .../com/kiisoo/ic/store/service/PoiSellerService.java  | 10 ++++++++--
 src/main/resources/mapper/OpCustomerDOMapper.xml       |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java
index 028215a..26035b5 100644
--- a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java
+++ b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,9 +30,9 @@ public class PoiStoreStaffController extends BaseController {
      */
     @ResponseBody
     @PostMapping("/user/seller")
-    public Map<String,Object> getSellerData(@RequestParam("userId")long userId, Long shopId, Long regionId, Long companyId){
+    public Map<String,Object> getSellerData(@RequestParam("userId")long userId, Long shopId, Long regionId, Long companyId, List<Long> customers){
         try {
-            return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId));
+            return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId, customers));
         }catch (Exception e){
             log.error("查找用户管辖的导购",e);
             return fail();
diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java
index 26ed73e..a6b15c6 100644
--- a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java
@@ -44,7 +44,7 @@ public class PoiSellerService {
     /**
      * 找到区域或者店铺中所有的导购
      */
-    public List<PoiStoreStaffDTO> getAllSeller(Long regionId, Long shopId, long userId, Long companyId){
+    public List<PoiStoreStaffDTO> getAllSeller(Long regionId, Long shopId, long userId, Long companyId, List<Long> customers){
         List<Long> shopIds = new ArrayList<>();
         //先找到店铺
         if(null != shopId){
@@ -59,7 +59,13 @@ public class PoiSellerService {
         }else if(companyId != null){
             //有公司就查公司店铺
             shopIds.addAll(customerViewService.getCompanyShop(companyId,userId));
-        }else{
+        }else if(customers != null){
+            for(Long cp : customers){
+                //有公司就查公司店铺
+                shopIds.addAll(customerViewService.getCompanyShop(cp,userId));
+            }
+
+        }else {
             //什么都没有就全查
             shopIds = privilageDomainService.listUserDatePermission(userId);
         }
diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index 7f126c3..9cabed1 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -30,12 +30,12 @@
         <if test="endDate != null">
             and t1.create_time <![CDATA[ < ]]> #{endDate}
         </if>
-        order by t2.id,t1.user_id asc
+        order by t2.id,t1.user_id, t1.create_time desc
     </select>
     <select id="selectCustomerInfoBySellerId" resultType="com.kiisoo.ic.customer.bean.OpCustomerDTO">
         select
         t2.id,t2.`name`,t2.member_id as idCard,GROUP_CONCAT(DISTINCT t0.`name`) as shopName, GROUP_CONCAT(DISTINCT t4.`name`) as sellerName, t3.birthday, t2.phone
-        ,t3.name as vipName,t3.phone as vipPhone
+        ,t3.name as vipName,t3.phone as vipPhone, t1.create_time
         from
         poi_store t0,
         op_seller_customer_relation t1 LEFT JOIN privilage_user t4 on t1.user_id = t4.id,
@@ -49,7 +49,7 @@
             and t1.create_time <![CDATA[ < ]]> #{endDate}
         </if>
         GROUP BY t2.id
-        order by t2.id asc
+        order by t2.id, t1.create_time desc
     </select>
 
     <!--客户list-->