绑定好友

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public class AgentEnterpriseDTO implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+    private String wxEnterpriseRelatedId;
+    private String enterpriseName;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String version;
+    private int nodeCount;
+    private String enterpriseLogo;
+    private String staffId;
+    private String staffName;
+    private Date createTime;
+    private String brandName;
+    private Integer wxEnterpriseType;
+    private Integer memberOpenCardFlag;
+
+    public Integer getWxEnterpriseType() {
+        return wxEnterpriseType;
+    }
+
+    public void setWxEnterpriseType(Integer wxEnterpriseType) {
+        this.wxEnterpriseType = wxEnterpriseType;
+    }
+
+    public Integer getMemberOpenCardFlag() {
+        return memberOpenCardFlag;
+    }
+
+    public void setMemberOpenCardFlag(Integer memberOpenCardFlag) {
+        this.memberOpenCardFlag = memberOpenCardFlag;
+    }
+
+    public String getWxEnterpriseRelatedId() {
+        return wxEnterpriseRelatedId;
+    }
+
+    public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+        this.wxEnterpriseRelatedId = wxEnterpriseRelatedId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public int getNodeCount() {
+        return nodeCount;
+    }
+
+    public void setNodeCount(int nodeCount) {
+        this.nodeCount = nodeCount;
+    }
+
+    public String getEnterpriseLogo() {
+        return enterpriseLogo;
+    }
+
+    public void setEnterpriseLogo(String enterpriseLogo) {
+        this.enterpriseLogo = enterpriseLogo;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/LoginVO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/LoginDTO.java

-package com.gic.haoban.manage.web.vo;
+package com.gic.haoban.manage.api.dto;
 
 import java.io.Serializable;
 
-import com.gic.haoban.manage.api.dto.StaffDTO;
-
-public class LoginVO implements Serializable{
+public class LoginDTO implements Serializable {
 
     /**
 	 * 

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/LoginVO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 import com.gic.haoban.manage.api.dto.StaffDTO;
 
-public class LoginVO implements Serializable{
+public class LoginDTO implements Serializable {
 
     /**
 	 * 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/auth/AuthRequestUtil.java

 package com.gic.haoban.manage.web.auth;
 
 import com.alibaba.fastjson.JSON;
-import com.gic.haoban.manage.web.vo.LoginVO;
+
 import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,12 +30,12 @@ public class AuthRequestUtil {
     public static final String REDIS_FAKE_LOGIN_FLAG_PREFIX = "GIC:HAOBAN:HAOBAN_MOBILE_APP:FAKE_LOGIN_TOKEN:";
     public static String LOGIN_SESSION_KEY = "HAOBAN:LOGINUSER";
 
-//    public static LoginVO getSessionUser() {
+//    public static LoginDTO getSessionUser() {
 //        String json = (String) getSession().getAttribute(LOGIN_SESSION_KEY);
 //        if (StringUtils.isBlank(json)){
 //            return null;
 //        }
-//        return JSON.parseObject(json, LoginVO.class);
+//        return JSON.parseObject(json, LoginDTO.class);
 //    }
 
     public static void setSessionUser(Object obj) {

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.WxApplicationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.api.service.WxApplicationApiService;
@@ -26,8 +13,16 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AdminRoleVO;
 import com.gic.haoban.manage.web.vo.AdminVO;
-import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 public class AdminController extends WebBaseController{
@@ -46,7 +41,7 @@ public class AdminController extends WebBaseController{
 	
 	@RequestMapping("admin-list")
 	public HaobanResponse adminList() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 2);
 		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);

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

 package com.gic.haoban.manage.web.controller;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.collection.CollectionUtil;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
-import com.gic.commons.util.GICMQClientUtil;
-import com.gic.haoban.common.utils.GlobalVar;
+import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
-import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
-import com.gic.haoban.manage.api.service.DepartmentApiService;
-import com.gic.haoban.manage.api.service.WxApplicationApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
-import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.service.ApplicationApiService;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.utils.RouterConstant;
-
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class ApplicationController extends WebBaseController{
@@ -65,9 +46,12 @@ public class ApplicationController extends WebBaseController{
 	@Autowired
 	private DealSyncOperationApiService dealSyncOperationApiService;
 
+	@Autowired
+	private QywxUserApiService qywxUserApiService;
+	
 	@RequestMapping("application-list")
 	public HaobanResponse applicationList() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
 		return resultResponse(HaoBanErrCode.ERR_1,list);
@@ -132,7 +116,7 @@ public class ApplicationController extends WebBaseController{
 	}
 	@RequestMapping("has-bind-contract")
 	public HaobanResponse hasBindContract(){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
@@ -168,7 +152,7 @@ public class ApplicationController extends WebBaseController{
 	
 	@RequestMapping("init-wx-department")
 	public HaobanResponse initWxDepartment(){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
@@ -241,8 +225,7 @@ public class ApplicationController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_0, "s");
 	}
 
-	@Autowired
-	private QywxUserApiService qywxUserApiService;
+
 	@RequestMapping("list-external-user")
 	@IgnoreLogin
 	public Object list(String corpid, String suiteid, String userid){
@@ -270,7 +253,7 @@ public class ApplicationController extends WebBaseController{
 	@RequestMapping("sync-qywx")
 	@IgnoreLogin
 	public Object syncQywx(){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null) {

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.ApplicationEnterpriseRelatedDTO;
 import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
 import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
 import com.gic.haoban.manage.api.service.ApplicationTemplateApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 @RestController
 public class ApplicationTemplateController extends WebBaseController{

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.StoreFieldEnum;
@@ -17,9 +14,9 @@ import com.gic.haoban.manage.api.service.AuditSettingApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.BatchApproveVO;
-import com.gic.haoban.manage.web.vo.LoginVO;
-
+import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -27,9 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.redis.data.util.RedisUtil;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/audit")
@@ -165,7 +162,7 @@ public class AuditController extends WebBaseController{
 		if(StringUtils.isAnyBlank(auditIds,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String staffId = login.getStaffDTO().getStaffId();
 		String staffName = login.getStaffDTO().getStaffName();
 		String[] s = auditIds.split(",");
@@ -195,7 +192,7 @@ public class AuditController extends WebBaseController{
 		if(StringUtils.isAnyBlank(auditId,auditReason,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String staffId = login.getStaffDTO().getStaffId();
 		String staffName = login.getStaffDTO().getStaffName();
 		auditApiService.refuse(auditId, auditReason,staffName,staffId);
@@ -205,7 +202,7 @@ public class AuditController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("audit")
 	public HaobanResponse audit(String auditId,String auditName ) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         StaffDTO loginStaffDTO = login.getStaffDTO();
 		if (null == loginStaffDTO) {
 			return resultResponse(HaoBanErrCode.ERR_4);

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

@@ -19,10 +19,7 @@ import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
@@ -34,7 +31,7 @@ import com.gic.haoban.manage.web.qo.SyncDepartmentQO;
 import com.gic.haoban.manage.web.thread.SyncDepartmentThread;
 import com.gic.haoban.manage.web.vo.DepartmentChainVO;
 import com.gic.haoban.manage.web.vo.DepartmentVO;
-import com.gic.haoban.manage.web.vo.LoginVO;
+
 import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -70,7 +67,7 @@ public class DepartmentContoller extends WebBaseController{
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
 	@RequestMapping("department-list")
 	public HaobanResponse departmentList(String parentId,BasePageInfo pageInfo,String keyWord) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		logger.info("【部门列表】wxEnterpriseId={}",wxEnterpriseId);
 		
@@ -111,7 +108,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-list-level")
 	public HaobanResponse departmentLevelList(String parentId) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		logger.info("【部门层级列表】wxEnterpriseId={}",wxEnterpriseId);
 		List<DepartmentDTO> list = new ArrayList<DepartmentDTO>();
@@ -220,7 +217,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-count")
 	public HaobanResponse departmentRecycleCount() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		Integer count = departmentApiService.departmentRecycleCount(wxEnterpriseId);
 		Map<String,Object> map = new HashMap<String, Object>();
@@ -256,7 +253,7 @@ public class DepartmentContoller extends WebBaseController{
 	@RequestMapping("department-batch-sync")
 	@ResponseBody
 	public HaobanResponse departmentBatchSync(@RequestBody SyncDepartmentQO args) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		String key = "haoban-sync-department-" + wxEnterpriseId;
 		if(RedisUtil.getCache(key) != null){
@@ -583,7 +580,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-list")
 	public HaobanResponse departmentRecycleList(String keyWord,Integer storeFlag,BasePageInfo pageInfo) {
-		LoginVO login =  (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId  = login.getWxEnterpriseId();
 		Integer recycleFlag = 1;
 		Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyWord,storeFlag,recycleFlag);
@@ -837,7 +834,7 @@ public class DepartmentContoller extends WebBaseController{
 
 	@RequestMapping("department-search")
 	public HaobanResponse departmentSearch(String search) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		if (StringUtils.isBlank(wxEnterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_6);
@@ -853,7 +850,7 @@ public class DepartmentContoller extends WebBaseController{
 	 */
 	@RequestMapping("department-list-cache")
 	public HaobanResponse departmentCachelist() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 		if (StringUtils.isBlank(wxEnterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_6);

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

@@ -3,11 +3,12 @@ package com.gic.haoban.manage.web.controller;
 import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.LoginVO;
+
 import com.gic.haoban.manage.web.vo.StoreGroupVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -43,7 +44,7 @@ public class GicDepartmentController extends WebBaseController{
 
 	@RequestMapping("gic-store-group-list")
 	public HaobanResponse storeGroupList(String enterpriseId, String keyWord) {
-		LoginVO loginUser = this.getLoginUser();
+        LoginDTO loginUser = this.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
 		List<PowerStoreGroupDTO> departmentList = storeGroupService.getStoreGroupList(enterpriseId, keyWord);
 		List<StoreRangeInfoDTO> rangeInfoDTOList = wxEnterpriseRelatedApiService.listAllBindStoreOrGroup(enterpriseId);

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.ToolUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxApplicationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
@@ -19,7 +20,6 @@ import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
@@ -41,7 +41,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 @RestController
@@ -96,7 +95,7 @@ public class LoginController extends WebBaseController{
 			}
 		}
 
-		LoginVO loginVO = new LoginVO();
+		LoginDTO loginVO = new LoginDTO();
 //		StaffDTO staff = staffApiService.selectById("1");
 		logger.info("【好办登录】staff={}",JSON.toJSONString(loginStaff));
 		if(loginStaff == null){
@@ -125,7 +124,7 @@ public class LoginController extends WebBaseController{
 	@RequestMapping("login_local")
 	public HaobanResponse login() {
 
-		LoginVO loginVO = new LoginVO();
+		LoginDTO loginVO = new LoginDTO();
 		StaffDTO staff = staffApiService.selectById("2205f92cdb5f468cb996e91dded414c2");
 		String token = ToolUtil.randomUUID() + "-" + ToolUtil.randomStringByTime();
 		logger.info("【好办登录】staff={}",JSON.toJSONString(staff));
@@ -139,7 +138,7 @@ public class LoginController extends WebBaseController{
 	
 	@RequestMapping("get-login-info")
 	public HaobanResponse getLoginInfo(){
-		LoginVO loginVO = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO loginVO = (LoginDTO) AuthRequestUtil.getLoginUser();
 		return resultResponse(HaoBanErrCode.ERR_1,loginVO);
 	}
 	
@@ -165,7 +164,7 @@ public class LoginController extends WebBaseController{
 		//TODO 获取超级管理员账号接口
 		StaffDTO staff = staffApiService.selectSuperByWxEnterpriseId(wxEnterpriseId);
 //		StaffDTO staff = staffApiService.selectById("1");
-		LoginVO loginVO = new LoginVO();
+		LoginDTO loginVO = new LoginDTO();
 		loginVO.setWxEnterpriseId(wxEnterpriseId);
 		loginVO.setStaffDTO(staff);
 		AuthRequestUtil.setSessionUser(loginVO);
@@ -252,7 +251,7 @@ public class LoginController extends WebBaseController{
 			return model;
 		}
 //		StaffDTO staff = staffApiService.selectById("1");
-		LoginVO loginVO = new LoginVO();
+		LoginDTO loginVO = new LoginDTO();
 		loginVO.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
 		loginVO.setStaffDTO(staff);
 		AuthRequestUtil.setSessionUser(loginVO);

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

@@ -5,13 +5,13 @@ import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
 import com.gic.haoban.manage.api.dto.MaterialDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.LoginVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +31,7 @@ public class MaterialController extends WebBaseController{
      */
     @RequestMapping("/mateial-add-category")
     public HaobanResponse materialAddCategory(MaterialCategoryDTO materialCategoryDTO) {
-    	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
     	materialCategoryDTO.setWxEnterpriseId(wxEnterpriseId);
 		String categoryName  = materialCategoryDTO.getCategoryName();
@@ -112,7 +112,7 @@ public class MaterialController extends WebBaseController{
      */
     @RequestMapping("/material-add")
     public HaobanResponse materialAdd(MaterialDTO materialDTO) {
-    	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
     	materialDTO.setWxEnterpriseId(wxEnterpriseId);
     	
@@ -148,7 +148,7 @@ public class MaterialController extends WebBaseController{
      */
     @RequestMapping("/material-edit")
     public HaobanResponse materialEdit(MaterialDTO materialDTO) {
-    	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 
         StaffDTO staff = login.getStaffDTO();
     	materialDTO.setStaffId(staff.getStaffId());
@@ -218,7 +218,7 @@ public class MaterialController extends WebBaseController{
 	 */
 	@RequestMapping("/material-share")
     public HaobanResponse materialShare(String materialIds, String toWxEnterpriseIds) {
-        LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String[] wxEids = toWxEnterpriseIds.split(",");
         String[] maIds = materialIds.split(",");
         for (String maId : maIds) {

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

@@ -26,7 +26,7 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
 import com.gic.haoban.manage.web.vo.ClerkInfoVo;
-import com.gic.haoban.manage.web.vo.LoginVO;
+
 import com.gic.haoban.manage.web.vo.StaffExportVO;
 import com.gic.haoban.manage.web.vo.StaffVO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -87,7 +87,7 @@ public class StaffController extends WebBaseController{
 
 	@RequestMapping("staff-add")
 	public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		String staffName = staffDTO.getStaffName();
 		String phoneNumber = staffDTO.getPhoneNumber();
@@ -123,7 +123,7 @@ public class StaffController extends WebBaseController{
 	
 	@RequestMapping("staff-list")
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyWord,BasePageInfo pageInfo){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<String> departmentIdSet = new ArrayList<>();
 		departmentIdSet.add(departmentId);
@@ -303,7 +303,7 @@ public class StaffController extends WebBaseController{
 	 */
 	@RequestMapping("del-clerk-relation")
 	public HaobanResponse delStaffClerkList(String staffId,String clerkId){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		StaffDTO staffDTO = login.getStaffDTO();
 		if (staffDTO==null) {
 			logger.info("登录异常");
@@ -338,7 +338,7 @@ public class StaffController extends WebBaseController{
 	 */
 	@RequestMapping("search-clerk-relation")
 	public HaobanResponse staffClerkSearch(String search){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		if (null == wxEnterpriseId) {
 			return resultResponse(HaoBanErrCode.ERR_4);
@@ -390,7 +390,7 @@ public class StaffController extends WebBaseController{
 	 */
 	@RequestMapping("add-clerk-relation")
 	public HaobanResponse staffClerkSearch(String staffId,String clerkId){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		StaffDTO loginStaffDTO = login.getStaffDTO();
 		if (null == loginStaffDTO) {
 			return resultResponse(HaoBanErrCode.ERR_4);
@@ -433,7 +433,7 @@ public class StaffController extends WebBaseController{
 	 */
 	@RequestMapping("staff-clerk-bind-log")
 	public HaobanResponse bindLogs(String search,String enterpriseId,@RequestParam(defaultValue = "-1") Integer optType,BasePageInfo qo){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		StaffDTO loginStaffDTO = login.getStaffDTO();
 		if (null == loginStaffDTO) {
 			return resultResponse(HaoBanErrCode.ERR_4);
@@ -456,7 +456,7 @@ public class StaffController extends WebBaseController{
 		int pageNum = 1;
 		pageInfo.setPageNum(pageNum);
 		pageInfo.setPageSize(pageSize);
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		String wxEnterpriseName = "";

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

@@ -4,19 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.PreDealLogInfoDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.SyncCheckDTO;
-import com.gic.haoban.manage.api.dto.SyncTaskDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.SyncDealQO;
-import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +39,7 @@ public class SyncDealContoller extends WebBaseController {
             task = dealSyncOperationApiService.createTask(wxEid, "门店同步", "11111", "部门同步");
             dealSyncOperationApiService.dealDepartment(task, wxEid, qo.getAddDepartment(), qo.getEditDepartment());
         } else {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             String wxEnterpriseId = login.getWxEnterpriseId();
             String key = "haoban-sync-department-" + wxEnterpriseId;
             if (RedisUtil.getCache(key) != null) {
@@ -63,7 +58,7 @@ public class SyncDealContoller extends WebBaseController {
     public HaobanResponse departmentBatchSync(@RequestBody SyncDealQO qo) {
         String task = null;
 
-        LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
 
         logger.info("login:{}", JSONObject.toJSONString(login));
@@ -98,7 +93,7 @@ public class SyncDealContoller extends WebBaseController {
     @RequestMapping("department-sync-check")
     public HaobanResponse syncSuccess(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         SyncCheckDTO taskCheck = dealSyncOperationApiService.getTaskCheck(wxEnterpriseId);
@@ -114,7 +109,7 @@ public class SyncDealContoller extends WebBaseController {
     @RequestMapping("/test/department-sync-check")
     public HaobanResponse testSyncSuccess(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         SyncCheckDTO taskCheck = dealSyncOperationApiService.getTaskCheck(wxEnterpriseId);
@@ -125,7 +120,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse clerkReSync(String taskId) {
         if (StringUtils.isBlank(taskId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             String wxEnterpriseId = login.getWxEnterpriseId();
             taskId = dealSyncOperationApiService.getTaskLock(wxEnterpriseId);
         }
@@ -138,7 +133,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse closeReSync(String wxEnterpriseId) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         dealSyncOperationApiService.closeTask(wxEnterpriseId);
@@ -157,7 +152,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTask(String wxEnterpriseId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<SyncTaskDTO> retPage = dealSyncOperationApiService.listSyncTask(wxEnterpriseId, pageInfo);
@@ -176,7 +171,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTaskDetail(String wxEnterpriseId, String taskId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+            LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<PreDealLogInfoDTO> retPage = dealSyncOperationApiService.listSyncTaskDetail(wxEnterpriseId, taskId, pageInfo);

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

@@ -2,9 +2,9 @@ package com.gic.haoban.manage.web.controller;
 
 import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.LoginVO;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.util.ArrayList;
@@ -49,8 +49,8 @@ public class WebBaseController {
      *
      * @return
      */
-    protected LoginVO getLoginUser() {
-        LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+    protected LoginDTO getLoginUser() {
+        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         return login;
     }
 

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

@@ -25,7 +25,7 @@ import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.WxEnterpriseBindQo;
 import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
-import com.gic.haoban.manage.web.vo.LoginVO;
+
 import com.gic.haoban.manage.web.vo.SecretSettingVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
 import com.gic.quartz.api.dto.QuartzTaskDTO;
@@ -43,10 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -82,7 +79,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList() {
 //		String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
 		if(CollectionUtil.isNotEmpty(list)){
@@ -169,7 +166,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if (StringUtils.isAnyBlank(bindQo.getEnterpriseId(), bindQo.getVersion())) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		StaffDTO staff = login.getStaffDTO();
 		String staffId = staff.getStaffId();
@@ -197,7 +194,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("store-full-list")
 	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String keyWord) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 //		String wxEnterpriseId = "1";
 		int maxVersionCount = 0;
@@ -256,7 +253,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@RequestMapping("is-wx-enterprise-secret-set")
 	public HaobanResponse isWxEnterpriseSecretSet() {
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId);
@@ -292,7 +289,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -330,7 +327,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -380,7 +377,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -434,7 +431,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -472,7 +469,7 @@ public class WxEnterpriseController extends WebBaseController{
 	public HaobanResponse secretList() {
 
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -531,7 +528,7 @@ public class WxEnterpriseController extends WebBaseController{
      */
     @RequestMapping("/fresh-wx-friend")
     public HaobanResponse freshWxFriend(){
-    	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		String dayKey = "haoban_fresh-wx-friend-day" + wxEnterpriseId + DateUtil.dateToStr(new Date(), "yyyy-MM-dd");
 		String monthKey = "haoban_fresh-wx-friend-month" + wxEnterpriseId + DateUtil.dateToStr(new Date(), "yyyy-MM");
@@ -570,7 +567,7 @@ public class WxEnterpriseController extends WebBaseController{
      */
     @RequestMapping("/get-fresh-detail")
     public HaobanResponse getFreshDetail(){
-    	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		String dateKey = "haoban_fresh-wx-friend-date" + wxEnterpriseId;
     	RedisUtil.getCache(dateKey);
@@ -589,7 +586,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if (org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 
 		WxEnterpriseRelationDetailDTO bindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, enterpriseId);
@@ -606,7 +603,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("bind-store-list")
 	public HaobanResponse bindStoreList(String enterpriseId, String search, BasePageInfo basePageInfo) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		Page<BindStoreInfoDTO> retPage = wxEnterpriseRelatedApiService.pageBindStoreByEnterpriseId(wxEnterpriseId, enterpriseId, search, basePageInfo);
 		return resultResponse(HaoBanErrCode.ERR_1, retPage);
@@ -621,7 +618,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("flush-bind-store-list")
 	public HaobanResponse flushBindStoreList(String enterpriseId) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		ServiceResponse response = wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, login.getStaffDTO().getStaffId(), ChannelCodeEnum.SYNC_UNBIND.getCode());
 		logger.info("返回信息：{}", JSONObject.toJSONString(response));
@@ -640,7 +637,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("list-miniprogram-setting")
 	public HaobanResponse miniprogramList() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
         List<MiniprogramSettingDTO> settingDTOS = wxEnterpriseApiService.listMiniprogramSetting(wxEnterpriseId);
         return resultResponse(HaoBanErrCode.ERR_1, settingDTOS);
@@ -658,7 +655,7 @@ public class WxEnterpriseController extends WebBaseController{
 				, settingDTO.getImageUrl(), settingDTO.getMiniprogramName(), settingDTO.getTitle())) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		settingDTO.setWxEnterpriseId(wxEnterpriseId);
         MiniprogramSettingDTO miniprogramSettingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, settingDTO.getEnterpriseId());
@@ -680,7 +677,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if (StringUtils.isEmpty(enterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		MiniprogramSettingDTO settingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, enterpriseId);
 		return resultResponse(HaoBanErrCode.ERR_1, settingDTO);
@@ -708,18 +705,23 @@ public class WxEnterpriseController extends WebBaseController{
      */
     @RequestMapping("/agent-wx-enterprise-list")
     public HaobanResponse materialShare() {
-        LoginVO loginUser = this.getLoginUser();
+		LoginDTO loginUser = this.getLoginUser();
 		String wxEnterpriseId = loginUser.getWxEnterpriseId();
         List<EnterpriseDetailDTO> detailDTOS = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
         List<String> enterpriseIds = detailDTOS.stream().filter(dto -> dto.getWxEnterpriseType() == 0).map(dto -> dto.getEnterpriseId()).collect(Collectors.toList());
 
         List<EnterpriseDetailDTO> retList = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
-        List<EnterpriseDetailDTO> ret = retList.stream().filter(dto -> dto.getWxEnterpriseType() == 1).map(dto -> {
-            EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(dto.getEnterpriseId());
-            dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
-            return dto;
-        }).collect(Collectors.toList());
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+		Map<String, EnterpriseDetailDTO> detailDTOMap = retList.stream().filter(dto -> dto.getWxEnterpriseType() == 1).collect(Collectors.toMap(dto -> dto.getWxEnterpriseId(), dto -> dto, (ne, ol) -> ne));
+		Collection<EnterpriseDetailDTO> values = detailDTOMap.values();
+		List<AgentEnterpriseDTO> enterpriseList = EntityUtil.changeEntityListByOrika(AgentEnterpriseDTO.class, values);
+		if (CollectionUtils.isNotEmpty(values)) {
+			enterpriseList.forEach(dto -> {
+				WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(dto.getWxEnterpriseId());
+				dto.setEnterpriseName(wxEnterpriseDTO.getCorpName());
+			});
+		}
+
+		return resultResponse(HaoBanErrCode.ERR_1, enterpriseList);
 	}
 
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java

@@ -2,15 +2,11 @@ package com.gic.haoban.manage.web.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.auth.api.anno.MenuCheck;
-import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
-import com.gic.haoban.auth.api.enums.RoleCodeEnum;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.vo.LoginVO;
-
-//import com.gic.redis.data.util.GicRateLimiter;
 import com.gic.redis.data.util.GicRateLimiter;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -22,12 +18,12 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Arrays;
 import java.util.Map;
 
+//import com.gic.redis.data.util.GicRateLimiter;
+
 /**
  * Created 2018/7/20.
  *
@@ -79,7 +75,7 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
 				}
 			}
 		}
-        LoginVO loginUser = (LoginVO) AuthRequestUtil.getAppLoginUser(token);
+        LoginDTO loginUser = (LoginDTO) AuthRequestUtil.getAppLoginUser(token);
 
         if (loginUser == null) {
             this.errorResult(httpServletResponse, HaoBanErrCode.ERR_4);

haoban-manage3-wx/pom.xml

@@ -171,6 +171,11 @@
 		</dependency>
 		<dependency>
 			<groupId>com.gic</groupId>
+			<artifactId>gic-member-api</artifactId>
+			<version>${gic-member-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
 			<artifactId>haoban-message-api</artifactId>
 			<version>${haoban-message-api}</version>
 		</dependency>

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

@@ -22,6 +22,7 @@ import com.gic.haoban.manage.web.qo.MemberLoginQo;
 import com.gic.haoban.manage.web.vo.AppStaffVo;
 import com.gic.haoban.manage.web.vo.InfoVo;
 import com.gic.haoban.manage.web.vo.StoreMemberVO;
+import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -84,6 +85,9 @@ public class InfoController extends WebBaseController{
     @Autowired
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
 
+    @Autowired
+    private MemberOpenCardBusinessService memberOpenCardBusinessService;
+
     private static Logger logger= LoggerFactory.getLogger(InfoController.class);
 
 	@Autowired
@@ -352,4 +356,21 @@ public class InfoController extends WebBaseController{
         ExternalClerkRelatedDTO clerkRelatedDTO = clerkRelatedDTOS.get(0);
         return resultResponse(HaoBanErrCode.ERR_1, clerkRelatedDTO.getRelationKey());
     }
+
+    /**
+     * 绑定好友
+     * @param memberId
+     * @param enterpriseId
+     * @param unionid
+     * @param relationKey
+     * @return
+     */
+    @RequestMapping("member-bind-friend")
+    public HaobanResponse memberBindFriend(String memberId, String enterpriseId, String unionid, String relationKey) {
+        if (StringUtils.isAnyBlank(memberId, enterpriseId, relationKey)) {
+            return resultResponse(HaoBanErrCode.ERR_2);
+        }
+        memberOpenCardBusinessService.memberClerkProcessByQywxFriend(enterpriseId, memberId, unionid, relationKey);
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -57,6 +57,9 @@
 	
 	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>
 
+	<dubbo:reference interface="com.gic.member.api.service.MemberOpenCardBusinessService"
+					 id="memberOpenCardBusinessService"/>
+	
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" id="staffClerkRelationApiService"/>
 		
 	<dubbo:reference interface="com.gic.clerk.api.service.ClerkNewService" id="clerkNewService"/>