查询店铺接口

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

@@ -59,13 +59,9 @@ public class PoiStoreController extends BaseController {
 
     }
 
-    /**
-     * 根据用户id，区域id获取店铺
-     * @return
-     */
     @RequestMapping(value = "/user/shopDTO", method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> getUserShopDTO(@RequestParam("userId")long userId, @RequestParam(value = "customerIds",required =false)String customerIds){
+    public Map<String, Object> getUserShopDTO(@RequestParam("userId") long userId, @RequestParam(value = "customerIds", required = false) String customerIds, @RequestParam("scheduleId") Long scheduleId) {
         try {
             List<Long> customers = null;
             if (StringUtils.isNotBlank(customerIds)) {
@@ -80,7 +76,7 @@ public class PoiStoreController extends BaseController {
                     }
                 }
             }
-            return data(poiStoreService.getRegionShopDTO(userId,customers));
+            return data(poiStoreService.getRegionShopDTO(userId, customers, scheduleId));
         } catch (Exception e) {
             log.error("获取用户店铺失败", e);
             return fail();

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

@@ -2,6 +2,10 @@ package com.kiisoo.ic.store.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kiisoo.ic.activity.entity.PmnActivityInstance;
+import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation;
+import com.kiisoo.ic.activity.service.IPmnActivityInstanceService;
+import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService;
 import com.kiisoo.ic.customer.service.CustomerViewService;
 import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO;
 import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper;
@@ -11,11 +15,8 @@ import com.kiisoo.ic.generalize.mapper.PrivilageOrganizationalDomainMapper;
 import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper;
 import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.store.bean.PoiStoreDTO;
-import com.kiisoo.ic.store.bean.PoiStoreStaffDTO;
 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;
@@ -57,8 +58,10 @@ public class PoiStoreService {
     private IPmnActivityInstanceService pmnActivityInstanceService;
     @Autowired
     private IPmnActivityStoreRelationService storeRelationService;
+
     /**
      * 根据区域id找到店铺集合
+     *
      * @param regionId
      */
     public List<PoiStore> getRegionShop(long regionId) {
@@ -68,7 +71,6 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
-     * @param regionId
      */
     public List<PoiStore> getRegionShop(long userId, List<Long> customerIds) {
         List<PoiStore> poiStores = new ArrayList<>();
@@ -98,7 +100,6 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
-     * @param regionId
      */
     public List<PoiStoreDTO> getRegionShopDTO(long userId, List<Long> customerIds, Long scheduleId) {
         List<PoiStoreDTO> poiStores = new ArrayList<>();
@@ -129,6 +130,7 @@ public class PoiStoreService {
         }
         return poiStores;
     }
+
     /**
      * 查询所有店铺
      *
@@ -141,6 +143,7 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
+     *
      * @param companyId 零售公司ID
      */
     public List<PoiStore> getStoreByCompanyId(long userId, Long companyId) {