门店号管理

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

@@ -29,7 +29,7 @@ public class PoiStoreController extends BaseController {
      */
     @RequestMapping(value = "/user/shop",method = RequestMethod.GET)
     @ResponseBody
-    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, @RequestParam("customerIds[]")List<Long> customerIds){
+    public Map<String,Object> getUserShop(@RequestParam("userId")long userId, @RequestParam(value = "customerIds[]",required =false)List<Long> customerIds){
         try {
             return data(poiStoreService.getRegionShop(userId,customerIds));
         }catch (Exception e){

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

@@ -38,10 +38,10 @@ public class StoreEmployeeController extends BaseController {
      */
     @RequestMapping(value = "list",method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> listStoreUser(@RequestParam("userId")Long userId,Long storeId,Long bigRegionId,Long companyId,
+    public Map<String,Object> listStoreUser(@RequestParam("userId")Long userId,Long storeId,Long regionId,Long companyId,
                                             @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize ,String code){
         try {
-            PageInfo<StoreUserDTO> storeUserDTOS =  storeEmployeeService.listStoreUser(userId,storeId,bigRegionId,companyId,pageNum, pageSize,code);
+            PageInfo<StoreUserDTO> storeUserDTOS =  storeEmployeeService.listStoreUser(userId,storeId,regionId,companyId,pageNum, pageSize,code);
             return data(storeUserDTOS);
         }catch (Exception e){
             log.error("查询门店号列表失败",e);

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

@@ -9,6 +9,7 @@ import com.kiisoo.ic.common.utils.ExcelUtils;
 import com.kiisoo.ic.common.utils.MD5FileUtil;
 import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
 import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper;
+import com.kiisoo.ic.customer.service.CustomerViewService;
 import com.kiisoo.ic.department.entity.DepartmentDO;
 import com.kiisoo.ic.department.mapper.PrivilageDepartmentDOMapper;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
@@ -17,8 +18,8 @@ import com.kiisoo.ic.employee.entity.ImportErrorDTO;
 import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper;
 import com.kiisoo.ic.employee.service.EmployeeService;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
-import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper;
+import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.store.bean.BsdShareCodeResponse;
 import com.kiisoo.ic.store.bean.PoiStoreStaffDTO;
 import com.kiisoo.ic.store.entity.PoiStore;
@@ -46,8 +47,8 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.kiisoo.ic.employee.constant.Constants.ADD_CP_CODE_BINDED;
@@ -90,6 +91,9 @@ public class StoreEmployeeService {
 
     @Autowired
     private RetailCompanyService retailCompanyService;
+
+    @Autowired
+    private CustomerViewService customerViewService;
     /**
      * 查询门店号
      * @param storeId 门店id
@@ -107,18 +111,11 @@ public class StoreEmployeeService {
             List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
             shopIds.retainAll(userAllShops);
         }else if(companyId != null){
-            Set<Long> customerIds = new HashSet<>();
+            shopIds = new ArrayList<>(customerViewService.getCompanyShop(companyId, userId));
-            retailCompanyService.getMinCompany(companyId,customerIds);
-            //如果有公司则查公司店铺
-            List<PoiStore> shops = retailCompanyService.selectShopByCompany(companyId);
-            shopIds = shops.stream().map(p -> p.getId()).collect(Collectors.toList());
             List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
             shopIds.retainAll(userAllShops);
         }else if(bigRegionId != null){
-            shopIds = privilageDomainService.listUserDatePermission(userId);
+            shopIds = new ArrayList<>(customerViewService.getCompanyShop(bigRegionId, userId));
-            //有区域就查区域店铺
-            List<PoiStore> stores = poiStoreDOMapper.selectRegionShop(bigRegionId);
-            shopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList());
             List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
             shopIds.retainAll(userAllShops);
         }else{

src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectCpUserByShops" resultType="com.kiisoo.ic.store.entity.StoreUserDTO">
         select distinct pcu.cp_user_id as cpUserId,pcu.qr_code as qrCodeAction,pcus.store_id as id
-        from privilage_cp_user_store pcus ,privilage_cp_user pcu where pcus.cp_user_id = pcu.id and  pcu.status = 1
+        from privilage_cp_user_store pcus ,privilage_cp_user pcu where pcus.cp_user_id = pcu.id and  pcu.status in (1,4)
         <choose>
             <when test="shopIds != null and shopIds.size > 0">
                 and  pcus.store_id in