Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !415

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -32,6 +32,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.ClerkListDTO;
+import com.gic.clerk.api.dto.ClerkStoreListDTO;
 import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
@@ -92,6 +93,7 @@ import com.gic.haoban.manage.web.vo.AuditSettingVO;
 import com.gic.haoban.manage.web.vo.BindClerkVO;
 import com.gic.haoban.manage.web.vo.ClerkDetailVo;
 import com.gic.haoban.manage.web.vo.ClerkEditInfoVO;
+import com.gic.haoban.manage.web.vo.ClerkListVO;
 import com.gic.haoban.manage.web.vo.ClerkStoreVO;
 import com.gic.haoban.manage.web.vo.OperationSettingVO;
 import com.gic.haoban.manage.web.vo.StaffStoreVO;
@@ -1714,4 +1716,51 @@ public class WxStaffController extends WebBaseController {
         }
         return RestResponse.successResult(retList);
     }
+    
+    /**
+     * 门店导购查询
+     */
+    @RequestMapping("store-clerk-list")
+    public RestResponse<Object> listStoreClerk(String enterpriseId , String wxEnterpriseId , String clerkId ,String clerkSearchParams , BasePageInfo basePageInfo) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("enterpriseId", enterpriseId);
+        // 2线上
+        params.put("status", 2);
+        // 只获取导购和店长
+        params.put("clerkTypeList", Arrays.asList(1, 0));
+        if (StringUtils.isNotBlank(clerkSearchParams)) {
+            params.put("clerkSearchParams", "%" + clerkSearchParams + "%");
+        }
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        int clerkType = clerk.getClerkType() ;
+        if(clerkType==0) {
+            return RestResponse.failure("-1", "无权访问");
+        }else if(clerkType==1) {
+            params.put("storeIdList", Arrays.asList(clerk.getStoreId()));
+        }else if(clerkType==2) {
+            // 如果有权限控制,进行管辖门店过0滤
+            List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId,wxEnterpriseId);
+            if (CollectionUtils.isEmpty(authStoreIdList)) {
+                return RestResponse.failure("-1", "无授权门店");
+            }
+            if (!(authStoreIdList.size() == 1 && authStoreIdList.contains("-1"))) {
+                params.put("storeIdList", authStoreIdList);
+            }
+        }
+        Page<ClerkStoreListDTO> page = new Page<>();
+        page.setPageSize(basePageInfo.getPageSize());
+        page.setCurrentPage(basePageInfo.getPageNum());
+        page.setParams(params);
+        logger.info("查询条件:{}", JSON.toJSONString(params));
+        page = this.clerkService.listStoreClerkByPage(page);
+        Page<ClerkListVO> retPage = new Page<>();
+        retPage.setPageSize(basePageInfo.getPageSize());
+        retPage.setCurrentPage(basePageInfo.getPageNum());
+        retPage.setParams(params);
+        retPage.setTotalCount(page.getTotalCount());
+        retPage.setTotalPage(page.getTotalPage());
+        List<ClerkListVO> result = EntityUtil.changeEntityListByJSON(ClerkListVO.class, page.getResult());
+        retPage.setResult(result);
+        return RestResponse.successResult(retPage);
+    }
 }