门店号管理

src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java

@@ -162,7 +162,10 @@ public class EmployeeService {
         privilageCpUserDO.setCpUserId(wxCpUser.getUserId());
         String alias = privilageCpUserDO.getAlias();
         alias = filterEmoji(alias);
+        String name = privilageCpUserDO.getName();
+        name = filterEmoji(name);
         privilageCpUserDO.setAlias(alias);
+        privilageCpUserDO.setName(name);
 
         if (CollectionUtils.isEmpty(cuUserIdUser)) {
             //添加用户

src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java

@@ -29,9 +29,9 @@ public class PoiStoreController extends BaseController {
      */
     @RequestMapping(value = "/user/shop",method = RequestMethod.GET)
     @ResponseBody
-    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, Long bigRegionId, Long companyId){
+    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, @RequestParam("customerIds[]")List<Long> customerIds){
         try {
-            return data(poiStoreService.getRegionShop(userId,bigRegionId,companyId));
+            return data(poiStoreService.getRegionShop(userId,customerIds));
         }catch (Exception e){
             log.error("获取用户店铺失败",e);
             return fail();

src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java

@@ -9,10 +9,12 @@ import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
 import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -46,21 +48,20 @@ public class PoiStoreService {
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
      * @param regionId
      */
-    public List<PoiStore> getRegionShop(long userId,Long regionId, Long companyId){
+    public List<PoiStore> getRegionShop(long userId,List<Long> customerIds){
         List<PoiStore> poiStores = new ArrayList<>();
         //找到店铺集合
         List<Long> shopsIds = privilageDomainService.listUserDatePermission(userId);
-        if(null != regionId){
+        if(null != customerIds && customerIds.size()>0){
-            List<PoiStore> regionPoiStores = poiStoreDOMapper.selectRegionShop(regionId);
+            Set<Long> shopIds = new HashSet<>();
-            for(PoiStore item : regionPoiStores){
+            customerIds.forEach(customerId -> {
-                if(shopsIds.contains(item.getId())){
+                Set<Long> shops = customerViewService.getCompanyShop(customerId,userId);
-                    poiStores.add(item);
+                if (CollectionUtils.isNotEmpty(shops)){
+                    shopIds.addAll(shops);
                 }
-            }
+            });
-        }else if(companyId != null){
+            if(shopIds.size() > 0){
-            Set<Long> shops = customerViewService.getCompanyShop(companyId,userId);
+                List<PoiStore> regionPoiStores = poiStoreDOMapper.selectBatchIds(shopIds);
-            if(shops.size() > 0){
-                List<PoiStore> regionPoiStores = poiStoreDOMapper.selectBatchIds(shops);
                 for(PoiStore item : regionPoiStores){
                     if(shopsIds.contains(item.getId())){
                         poiStores.add(item);

src/main/resources/mapper/PoiStoreDOMapper.xml

@@ -54,7 +54,7 @@
         poi_store t3
         where 1 = 1
         and t.id = #{orgId}
-        and t.level = 1
+        and t.level = 3
         and t.id = t1.org_id
         and t1.domain_id = t2.domain_id
         and t2.entity_id = t3.id