From ca311e732da6d7a71c6de143f3b6bf7937dce668 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Mon, 27 Apr 2020 18:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/controller/PoiStoreController.java   |  7 ++++++-
 .../controller/PoiStoreStaffController.java    |  4 ++--
 .../ic/store/service/PoiSellerService.java     | 18 ++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java
index f0e856c..5925c9a 100644
--- a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java
+++ b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java
@@ -9,8 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 门店
@@ -31,8 +33,11 @@ public class PoiStoreController extends BaseController {
      */
     @RequestMapping(value = "/user/shop",method = RequestMethod.GET)
     @ResponseBody
-    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, @RequestParam(value = "customerIds[]",required =false)List<Long> customerIds){
+    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, @RequestParam(value = "customerIds[]",required =false)List<Long> customerIds,String customerId){
         try {
+            if((customerIds == null || customerIds.size() == 0)&& customerId != null){
+                customerIds = Arrays.asList(customerId.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());;
+            }
             return data(poiStoreService.getRegionShop(userId,customerIds));
         }catch (Exception e){
             log.error("获取用户店铺失败",e);
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 26035b5..1eed1f8 100644
--- a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java
+++ b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java
@@ -30,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, List<Long> customers){
+    public Map<String,Object> getSellerData(@RequestParam("userId")long userId, Long shopId, Long regionId, Long companyId){
         try {
-            return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId, customers));
+            return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId));
         }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 a6b15c6..e98a51e 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, List<Long> customers){
+    public List<PoiStoreStaffDTO> getAllSeller(Long regionId, Long shopId, long userId, Long companyId){
         List<Long> shopIds = new ArrayList<>();
         //先找到店铺
         if(null != shopId){
@@ -59,13 +59,15 @@ public class PoiSellerService {
         }else if(companyId != null){
             //有公司就查公司店铺
             shopIds.addAll(customerViewService.getCompanyShop(companyId,userId));
-        }else if(customers != null){
-            for(Long cp : customers){
-                //有公司就查公司店铺
-                shopIds.addAll(customerViewService.getCompanyShop(cp,userId));
-            }
-
-        }else {
+        }
+//        else if(customers != null){
+//            for(Long cp : customers){
+//                //有公司就查公司店铺
+//                shopIds.addAll(customerViewService.getCompanyShop(cp,userId));
+//            }
+//
+//        }
+        else {
             //什么都没有就全查
             shopIds = privilageDomainService.listUserDatePermission(userId);
         }