企微托管账号

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffListDTO.java

@@ -73,6 +73,19 @@ public class StaffListDTO implements Serializable {
 
     private String loginEnterpriseId ;
 
+    /**
+     * 企微托管页面查询1是0否
+     */
+    private int qwOpenFlag ;
+
+    public int getQwOpenFlag() {
+        return qwOpenFlag;
+    }
+
+    public void setQwOpenFlag(int qwOpenFlag) {
+        this.qwOpenFlag = qwOpenFlag;
+    }
+
     public String getLoginEnterpriseId() {
         return loginEnterpriseId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/OpenStaffMapper.java

@@ -39,4 +39,6 @@ public interface OpenStaffMapper {
     List<OpenStaffDTO> list(OpenStaffPageQDTO qdto);
 
     TabOpenStaff getByQwUserId(@Param("qwUserId")Long qwUserId);
+
+    List<String> listAllStaffId(String wxEnterpriseId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/OpenStaffService.java

@@ -7,6 +7,8 @@ import com.gic.haoban.manage.api.dto.OpenStaffDTO;
 import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 import com.gic.haoban.manage.service.entity.TabOpenStaff;
 
+import java.util.List;
+
 public interface OpenStaffService {
 
     public TabOpenStaff save(TabOpenStaff tab) ;
@@ -16,4 +18,6 @@ public interface OpenStaffService {
     public void logout(String uuid) ;
 
     ServiceResponse<Page<OpenStaffDTO>> page(OpenStaffPageQDTO qdto, BasePageInfo basePageInfo);
+
+    List<String> listAllStaffId(String wxEnterpriseId) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/OpenStaffServiceImpl.java

@@ -81,4 +81,9 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         Page<OpenStaffDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, OpenStaffDTO.class);
         return ServiceResponse.success(retPage);
     }
+
+    @Override
+    public List<String> listAllStaffId(String wxEnterpriseId) {
+        return this.openStaffMapper.listAllStaffId(wxEnterpriseId);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -135,6 +135,8 @@ public class StaffApiServiceImpl implements StaffApiService {
     private MessageApiService messageApiService ;
     @Autowired
     private StoreService storeService ;
+    @Autowired
+    private OpenStaffService openStaffService ;
 
     @Override
     public StaffDTO selectById(String staffId) {
@@ -174,6 +176,9 @@ public class StaffApiServiceImpl implements StaffApiService {
         String wxEnterpriseId = staffListDTO.getWxEnterpriseId();
         BasePageInfo pageInfo = staffListDTO.getPageInfo();
         String enterpriseIdParam = staffListDTO.getEnterpriseIdParam();
+        if(staffListDTO.getQwOpenFlag()==1) {
+            enterpriseIdParam = staffListDTO.getLoginEnterpriseId() ;
+        }
         List<String> staffIds = new ArrayList<>();
         //查询所属品牌成员id
         if(StrUtil.isNotBlank(enterpriseIdParam)){
@@ -196,6 +201,13 @@ public class StaffApiServiceImpl implements StaffApiService {
                 }
             }
         }
+        if(staffListDTO.getQwOpenFlag()==1) {
+            List<String> list = this.openStaffService.listAllStaffId(wxEnterpriseId) ;
+            staffIds = staffIds.stream().filter(o->!list.contains(o)).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(staffIds)){
+            return new Page<>();
+        }
         StaffListBO staffListBO = EntityUtil.changeEntityByJSON(StaffListBO.class, staffListDTO);
         staffListBO.setStaffIds(staffIds);
         staffListBO.setRelationFlag(relationFlag);

haoban-manage3-service/src/main/resources/mapper/OpenStaffMapper.xml

@@ -129,4 +129,9 @@
         from tab_haoban_open_staff where qw_user_id = #{qwUserId} and delete_flag = 0
     </select>
 
+    <select id="listAllStaffId" resultType="java.lang.String">
+        select staff_id from tab_haoban_open_staff where wx_enterprise_id = #{wxEnterpriseId} and delete_flag = 0
+    </select>
+
+
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenController.java

@@ -52,11 +52,14 @@ public class QywxOpenController {
      * @return
      */
     @RequestMapping("open-staff-page")
-    public RestResponse<Page<OpenStaffVO>> page(@RequestBody OpenStaffQO qo,BasePageInfo basePageInfo) {
+    public RestResponse<Page<OpenStaffVO>> page(@RequestBody OpenStaffQO qo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         OpenStaffPageQDTO qdto = EntityUtil.changeEntityByJSON(OpenStaffPageQDTO.class,qo) ;
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        BasePageInfo basePageInfo = new BasePageInfo() ;
+        basePageInfo.setPageNum(qo.getPageNum());
+        basePageInfo.setPageSize(qo.getPageSize());
         ServiceResponse<Page<OpenStaffDTO>> pageResp = this.openStaffApiService.page(qdto, basePageInfo);
         Page<OpenStaffDTO> page = pageResp.getResult();
         Page<OpenStaffVO> retPage = PageHelperUtils.changePageToCurrentPage(page, OpenStaffVO.class);
@@ -64,7 +67,7 @@ public class QywxOpenController {
     }
 
     /**
-     * 托管列表
+     * 托管列表导出
      * @param qo
      * @return
      */
@@ -140,7 +143,7 @@ public class QywxOpenController {
      * @return
      */
     @RequestMapping("check-code")
-    public RestResponse<OpenStaffDTO> checkCode(Long openStaffId , String code) {
+    public RestResponse<Void> checkCode(Long openStaffId , String code) {
         ServiceResponse<Void> resp = this.openStaffApiService.checkCode(openStaffId,code) ;
         if(!resp.isSuccess()) {
             return RestResponse.failure("9999",resp.getMessage()) ;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/StaffListQO.java

@@ -65,6 +65,19 @@ public class StaffListQO implements Serializable {
 
     private String clerkId ;
 
+    /**
+     * 企微托管页面查询1是0否
+     */
+    private int qwOpenFlag ;
+
+    public int getQwOpenFlag() {
+        return qwOpenFlag;
+    }
+
+    public void setQwOpenFlag(int qwOpenFlag) {
+        this.qwOpenFlag = qwOpenFlag;
+    }
+
     public String getClerkId() {
         return clerkId;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/open/OpenStaffQO.java

 package com.gic.haoban.manage.web.qo.open;
 
+import com.gic.api.base.commons.BasePageInfo;
+
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class OpenStaffQO  extends BasePageInfo implements Serializable{
+
+    /**
+     * 1授权中 2已过期 3待验证 4待授权 0全部
+     */
+    private int status ;
+    /**
+     * 导购
+     */
+    private String clerkId ;
+    /**
+     * 成员
+     */
+    private String staffParams ;
+    /**
+     * 门店分组
+     */
+    private List<String> storeGroupIdList ;
+    /**
+     * 开始日期
+     */
+    private Date startDate ;
+    /**
+     * 结束日期
+     */
+    private Date endDate ;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getStaffParams() {
+        return staffParams;
+    }
+
+    public void setStaffParams(String staffParams) {
+        this.staffParams = staffParams;
+    }
+
+    public List<String> getStoreGroupIdList() {
+        return storeGroupIdList;
+    }
+
+    public void setStoreGroupIdList(List<String> storeGroupIdList) {
+        this.storeGroupIdList = storeGroupIdList;
+    }
 
-public class OpenStaffQO implements Serializable {
+    public Date getStartDate() {
+        return startDate;
+    }
 
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
 
+    public Date getEndDate() {
+        return endDate;
+    }
 
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }