Merge branch 'master_xgh_我的客户迭代' into 'xgh_内容中台'

导购查询

See merge request !419

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

@@ -45,6 +45,7 @@ import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.enterprise.api.service.StoreWidgetService;
+import com.gic.haoban.app.customer.dto.ChildrenListDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -1722,22 +1723,25 @@ public class WxStaffController extends WebBaseController {
      */
     @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() ;
+        List<ClerkListVO> resultList = null ;
         if(clerkType==0) {
             return RestResponse.failure("-1", "无权访问");
         }else if(clerkType==1) {
-            params.put("storeIdList", Arrays.asList(clerk.getStoreId()));
+            List<ClerkListDTO> clerkList = clerkService.getClerkByStoreId(enterpriseId, clerk.getStoreId());
+            if (CollectionUtils.isEmpty(clerkList)) {
+                return null;
+            }
+            resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, clerkList);
         }else if(clerkType==2) {
+            Map<String, Object> params = new HashMap<>();
+            params.put("enterpriseId", enterpriseId);
+            // 只获取导购和店长
+            params.put("clerkTypeList", Arrays.asList(1));
+            if (StringUtils.isNotBlank(clerkSearchParams)) {
+                params.put("clerkSearchParams", "%" + clerkSearchParams + "%");
+            }
             // 如果有权限控制,进行管辖门店过0滤
             List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId,wxEnterpriseId);
             if (CollectionUtils.isEmpty(authStoreIdList)) {
@@ -1746,21 +1750,25 @@ public class WxStaffController extends WebBaseController {
             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);
+        }
+        List<String> clerkIdList = resultList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
+        List<StaffClerkRelationDTO>  relationList = this.staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIdList, wxEnterpriseId) ;
+        List<String> retlationIdList = relationList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
+        resultList.removeIf(item->{
+           return !retlationIdList.contains(item.getClerkId()) ;
+        }) ;
         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);
+        retPage.setPageSize(resultList.size());
+        retPage.setCurrentPage(1);
+        retPage.setTotalCount(resultList.size());
+        retPage.setTotalPage(1);
+        retPage.setResult(resultList);
         return RestResponse.successResult(retPage);
     }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/ClerkListVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class ClerkListVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -4120100748397513224L;
+    private String clerkId;
+    private String clerkName;
+    private String clerkCode;
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+    
+}