Merge branch 'developer' into 'developer_repair_contact20200408'

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MemberStoreDTO implements Serializable {
+	
+	private String memberId;
+
+    private String storeId;
+    private static final long serialVersionUID = 1L;
+	public String getMemberId() {
+		return memberId;
+	}
+	public void setMemberId(String memberId) {
+		this.memberId = memberId;
+	}
+	public String getStoreId() {
+		return storeId;
+	}
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+    
+
+}

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

@@ -17,6 +17,8 @@ public class MemberUnionidRelatedDTO implements Serializable{
 
     private String wxEnterpriseId;
     
+    private String enterpriseId;
+
     private Integer statusFlag;
 
     private String externalUserid;
@@ -147,5 +149,13 @@ public class MemberUnionidRelatedDTO implements Serializable{
 		this.addCreateTime = addCreateTime;
 	}
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
     
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service;
 
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 
 public interface MemberUnionidRelatedApiService {
@@ -16,4 +17,6 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
 	
+	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
+
 }

haoban-manage3-service/pom.xml

@@ -105,6 +105,12 @@
         
         <dependency>
             <groupId>com.gic</groupId>
+            <artifactId>gic-search-engine-api</artifactId>
+            <version>${gic-search-engine-api}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.gic</groupId>
             <artifactId>gic-member-api</artifactId>
             <version>3.0-SNAPSHOT</version>
             <scope>compile</scope>

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

@@ -28,4 +28,6 @@ public interface MemberUnionidRelatedMapper {
 
 	MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId, 
 			@Param("externalName")String name, @Param("addCreateTime")String createTime);
+
+	List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("wxUserId")String wxUserId);
 }
\ No newline at end of file

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

@@ -44,4 +44,6 @@ public interface StaffDepartmentRelatedMapper {
 
 	int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
 	
+	List<TabHaobanStaffDepartmentRelated> listByWxUserId(@Param("wxUserId")String wxUserId);
+
 }
\ No newline at end of file

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

@@ -12,6 +12,8 @@ public class MemberUnionidRelated implements Serializable {
 
     private String wxEnterpriseId;
     
+    private String enterpriseId;
+
     private Integer statusFlag;
 
     private String externalUserid;
@@ -126,6 +128,14 @@ public class MemberUnionidRelated implements Serializable {
 		this.addCreateTime = addCreateTime;
 	}
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
     
     
 }
\ No newline at end of file

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

@@ -25,4 +25,7 @@ public interface StaffDepartmentRelatedService {
 	int countByDepartmentId(String departmentId);
 
 	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword);
+	
+	List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
+	
 }

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

@@ -22,6 +22,11 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	private StaffDepartmentRelatedMapper mapper;
 	
 	@Override
+	public List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId){
+		List<TabHaobanStaffDepartmentRelated> list = mapper.listByWxUserId(wxUserId);
+		return list;
+	}
+	@Override
 	public List<TabHaobanStaffDepartmentRelated> listByDepartmentId(String departmentId) {
 		
 		return mapper.listByDepartmentId(departmentId);

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

 package com.gic.haoban.manage.service.service.out.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -20,17 +24,23 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.MD5Utils;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.util.StringUtil;
+import com.gic.haoban.contacts.manage.api.dto.SearchDataDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
+import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
+import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -40,6 +50,13 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.member.api.service.MemberService;
 import com.gic.redis.data.anno.RedisLock;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.search.engine.api.constant.MemberDataEnum;
+import com.gic.search.engine.api.constant.OperateEnum;
+import com.gic.search.engine.api.dto.ESResponseQueryBatch;
+import com.gic.search.engine.api.dto.ESResponseQuerySingle;
+import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
+import com.gic.search.engine.api.filter.NewNodeAddUtil;
+import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
 
 @Service
 public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService{
@@ -71,7 +88,91 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	@Autowired
 	private DepartmentApiService departmentApiService;
 
+	@Autowired
+	private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
+	
+	@Autowired
+	private StaffDepartmentRelatedService staffDepartmentRelatedService;
+	@Autowired
+	private ESDataDynamicOperationApiService eSDataDynamicOperationApiService;
+	
+	@Override
+	public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
+		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId);
+		List<MemberStoreDTO> result = new ArrayList<>();
+		if(CollectionUtil.isEmpty(list)){
+			return null;
+		}
+		//1、查该staff的门店id
+		List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
+		if(CollectionUtil.isEmpty(relatedIds)){
+			log.info("staff关联部门不存在1");
+			return null;
+		}
+		List<String> departmentIds = relatedIds.stream().map(s->s.getDepartmentId()).collect(Collectors.toList());
+		if(CollectionUtil.isEmpty(departmentIds)){
+			log.info("staff部门不存在1");
+			return null;
+		}
+		List<DepartmentDTO> stores  = departmentApiService.listByDepartmentIds(departmentIds, 1);
+		if(CollectionUtil.isEmpty(stores)){
+			log.info("staff关联门店不存在1");
+			return null;
+		}
+		List<String> storeIds = stores.stream().map(s->s.getRelatedId()).collect(Collectors.toList());
+		
+		//2、获取member的storeId
+		for(MemberUnionidRelated tab : list){
+			String memberId = tab.getMemberId();
+			if(StringUtils.isEmpty(memberId)){
+				continue ;
+			}
+			String gicEnterpriseId = tab.getEnterpriseId();
+			JSONObject searchJson = new JSONObject();
+			searchJson = NewNodeAddUtil.addNewNodeForAnd(MemberDataEnum.member_memberId.getCode(), OperateEnum.OPERATE_EQ.getValue(), memberId,searchJson);
+			DynamicSearchDTO dynamicSearchDTO = new DynamicSearchDTO();
+			dynamicSearchDTO.setEnterpriseId(gicEnterpriseId);
+			dynamicSearchDTO.setColumnCategoryCode("member");
+			dynamicSearchDTO.setSearchJson(searchJson);
+			dynamicSearchDTO.setBegin(0);
+			dynamicSearchDTO.setRecordNumber(1);
+			log.info("gicEnterpriseId=========>{},searchJson=========={}",gicEnterpriseId,searchJson);
+			ESResponseQueryBatch responseQuery = eSDataDynamicOperationApiService.queryDataBatch(dynamicSearchDTO, false, null);
+			if(null == responseQuery){
+				log.info("会员不存在1");
+				continue;
+			}
+			List<JSONObject> res = responseQuery.getRes();			
+			if(CollectionUtil.isEmpty(res)){
+				log.info("会员不存在2");
+				continue;
+			}
+			String storeId = "";
+			for (JSONObject jsonObject : res) {
+				 storeId = jsonObject.get("storeId") == null?"":jsonObject.get("storeId").toString();
+			}
+			if(StringUtils.isEmpty(storeId)){
+				log.info("会员门店不存在");
+				continue;
+			}
+			String[] memberStoreIds =storeId.split(" "); 
+			List<String> memberStoreIdList = Arrays.asList(memberStoreIds);
+			//取交集
+			memberStoreIdList.retainAll(storeIds);
+			if(CollectionUtil.isEmpty(memberStoreIdList)){
+				continue;
+			}else{
+				for(String resultStoreId : memberStoreIdList){
+					MemberStoreDTO dto = new MemberStoreDTO();
+					dto.setMemberId(memberId);
+					dto.setStoreId(resultStoreId);
+					result.add(dto);
+				}
 				
+			}
+		}
+		return result;
+	}
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
 		TabHaobanStaff staff = staffService.selectById(staffId);
@@ -137,7 +238,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
 			String key = "external" + tabHaobanWxEnterpriseRelated.getEnterpriseId() + "_"+ userId1 + "_" + name + "_" + createTime;
 			RedisUtil.lock(key,2l);
-			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
+			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			dto.setEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
 			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){

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

@@ -22,6 +22,7 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.mq.sdk.GicMQClient;
+import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 
 import java.util.List;
 
@@ -193,7 +194,22 @@ public class MessageApiServiceImpl implements MessageApiService {
         }
         departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
         departmentDTO.setWxDepartmentId(qywxCallBackDTO.getId()+"");
+        if(qywxCallBackDTO.getParentId() != null){
+        	List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listDepartment(qywxCallBackDTO.getAuthCorpId(), qywxCallBackDTO.getSuiteId(), qywxCallBackDTO.getParentId());
+        	if(list != null){
+        		for (com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO2 : list) {
+    				if(departmentDTO2.getId().equals(departmentDTO.getDepartmentId())){
     					departmentDTO.setSort(qywxCallBackDTO.getOrder());
+    				}else{
+    					TabHaobanDepartment tab = this.departmentService.getByWxId(departmentDTO2.getId() + "", enterprise.getWxEnterpriseId());
+    					if(tab != null){
+    						tab.setSort(departmentDTO2.getOrder());
+    						this.departmentService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab));
+    					}
+    				}
+    			}
+        	}
+        }
         if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDDEPART.getCode())){
             String response = this.departmentService.add(departmentDTO);
             log.info("微信同步新增部门：{}", JSON.toJSONString(response));

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

@@ -28,6 +28,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
 	@Autowired
 	private StaffDepartmentRelatedMapper staffDepartmentRelatedMapper;
+	
 	@Override
 	public List<StaffDepartmentRelatedDTO> listByDepartmentId(
 			String departmentId) {

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -50,6 +50,7 @@
         <dubbo:reference interface="com.gic.enterprise.api.service.StoreService" id="storeService"/>
         
         <dubbo:reference interface="com.gic.member.api.service.MemberOpenCardBusinessService" id="memberOpenCardBusinessService"/>
+        <dubbo:reference id="eSDataDynamicOperationApiService" interface="com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService" timeout="10000"/>
         
         
 </beans>
\ No newline at end of file

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

@@ -6,6 +6,7 @@
     <result column="member_id" property="memberId" jdbcType="VARCHAR" />
     <result column="unionid" property="unionid" jdbcType="VARCHAR" />
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
+    <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="external_userid" property="externalUserid" jdbcType="VARCHAR" />
     <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid, 
-    wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name
+    wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -33,11 +34,11 @@
     insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id, 
       unionid, wx_enterprise_id, status_flag, 
       external_userid, wx_user_id, create_time, 
-      update_time,add_create_time,self_external_userid,external_name)
+      update_time,add_create_time,self_external_userid,external_name,enterprise_id)
     values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
       #{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, 
       #{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName})
+      #{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName},#{enterpriseId})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
     insert into tab_haoban_member_unionid_related
@@ -54,6 +55,9 @@
       <if test="wxEnterpriseId != null" >
         wx_enterprise_id,
       </if>
+      <if test="enterpriseId != null" >
+        enterprise_id,
+      </if>
       <if test="statusFlag != null" >
         status_flag,
       </if>
@@ -92,6 +96,9 @@
       <if test="wxEnterpriseId != null" >
         #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
+      <if test="enterpriseId != null" >
+        #{enterpriseId,jdbcType=VARCHAR},
+      </if>
       <if test="statusFlag != null" >
         #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -130,6 +137,9 @@
       <if test="wxEnterpriseId != null" >
         wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
+       <if test="enterpriseId != null" >
+        enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      </if>
       <if test="statusFlag != null" >
         status_flag = #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -162,6 +172,7 @@
     set member_id = #{memberId,jdbcType=VARCHAR},
       unionid = #{unionid,jdbcType=VARCHAR},
       wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+      enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
       status_flag = #{statusFlag,jdbcType=INTEGER},
       external_userid = #{externalUserid,jdbcType=VARCHAR},
       wx_user_id = #{wxUserId,jdbcType=VARCHAR},
@@ -198,6 +209,14 @@
     and status_flag = 1
     and wx_enterprise_id = #{wxEnterpriseId}
   </select>
+  <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_member_unionid_related
+    where wx_user_id = #{wxUserId}
+    and status_flag = 1
+    and external_userid = #{externalUserid}
+  </select>
   
   <select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 

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

@@ -232,6 +232,14 @@
     limit 1
   </select>
   
+   <select id="listByWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_department_related
+    where wx_user_id = #{wxUserId}
+    and status_flag = 1
+  </select>
+  
   
   <select id="countByDepartmentId" resultType="java.lang.Integer" parameterType="java.lang.String" >
     select 

haoban-manage3-service/src/test/java/ServiceTest.java

@@ -19,7 +19,7 @@ public class ServiceTest {
 
 	@Test
 	public void test() {
-		wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
+		//wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
 	}
 
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/anno/HttpLimit.java

+package com.gic.haoban.manage.web.anno;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.TimeUnit;
+/**
+ * 访问限制
+ * 默认1秒
+ * @author hzw
+ *
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HttpLimit {
+     long time() default 1L;
+     TimeUnit unit() default TimeUnit.SECONDS;
+     int times() default 2;
+}
\ No newline at end of file

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

@@ -30,6 +30,7 @@ import com.gic.haoban.manage.api.service.BindApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
 import com.gic.haoban.manage.web.vo.ClerkVo;
@@ -166,6 +167,7 @@ public class ClerkController extends WebBaseController{
 		
 	}
 	//成员绑定
+	@HttpLimit
 	@RequestMapping("/staff-bind")
 	public HaobanResponse staffBind(String departmentId,String fromClerkCode,String fromStaffDepartmentRelatedId) {
 		if(StringUtils.isAnyBlank(departmentId,fromClerkCode,fromStaffDepartmentRelatedId)){
@@ -175,6 +177,7 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//成员解除绑定
+	@HttpLimit
 	@RequestMapping("/clerk-single-unbind")
 	public HaobanResponse clerkSingleUnbind(String fromClerkCode,String departmentId) {
 		if(StringUtils.isAnyBlank(fromClerkCode)){
@@ -184,6 +187,7 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//成员换绑定
+	@HttpLimit
 	@RequestMapping("/clerk-unbind")
 	public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toStaffId,String manager) {
 		if(StringUtils.isAnyBlank(fromClerkCode,toStaffId)){
@@ -197,6 +201,7 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//店长转让
+	@HttpLimit
 	@RequestMapping("/clerk-manager-tranfer")
 	public HaobanResponse clerkManagerTranfer(String departmentId,String fromClerkCode,String toStaffDepartmentRelatedId) {
 		logger.info("===========================》111111111111111");

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -9,6 +10,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.contacts.manage.api.service.StoreService;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
@@ -21,6 +23,7 @@ import com.gic.haoban.manage.web.vo.StoreVO;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -55,6 +58,9 @@ public class InfoController extends WebBaseController{
     @Autowired
     private com.gic.enterprise.api.service.StoreService storeService;
 
+    @Autowired
+    private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
+    
     private static Logger logger= LoggerFactory.getLogger(InfoController.class);
 
 	@Autowired
@@ -96,6 +102,7 @@ public class InfoController extends WebBaseController{
         infoVo.setStaffName(loginStaff.getStaffName());
         infoVo.setPhoneNumber(loginStaff.getPhoneNumber());
         infoVo.setNationcode(loginStaff.getNationCode());
+        infoVo.setWxUserId(loginStaff.getWxUserId());
         return resultResponse(HaoBanErrCode.ERR_1,infoVo);
 
     }
@@ -165,6 +172,15 @@ public class InfoController extends WebBaseController{
 		
 	}
 	
+	@RequestMapping("get-member-store")
+	public HaobanResponse getMemberStore(String externalUserid,String wxUserId) {
+        if (StringUtils.isAnyBlank(externalUserid,wxUserId)) {
+            return resultResponse(HaoBanErrCode.ERR_2);
+        }
+        List<MemberStoreDTO> result =  memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId);
+        return resultResponse(HaoBanErrCode.ERR_1,result);
+	}
+	
 	@RequestMapping("get-staff-info")
 	public HaobanResponse getStaffInfo(String phoneNumber) {
         if (StringUtils.isBlank(phoneNumber)) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -69,6 +69,8 @@ public enum HaoBanErrCode {
     
     ERR_22(22, "验证码一分钟只能请求一次"),
     
+    ERR_10008(10008,"请不要过于频繁点击"),
+
     /**
      * 员工档案模块
      */

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

+package com.gic.haoban.manage.web.interceptor;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.anno.HttpLimit;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.redis.data.util.RedisUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 测试登录拦截器
+ *
+ * @author zhurz
+ */
+public class HttpLimitInterceptor extends HandlerInterceptorAdapter {
+
+    private static Logger logger = LoggerFactory.getLogger(HttpLimitInterceptor.class);
+
+    private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) {
+        HaobanResponse response = new HaobanResponse();
+        response.setErrorCode(errCode.getCode());
+        response.setMessage(errCode.getMsg());
+        PrintWriter writer = null;
+        try {
+            httpServletResponse.setHeader("Content-type", "application/json;charset=UTF-8");
+            writer = httpServletResponse.getWriter();
+            writer.append(JSONObject.toJSONString(response));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
+        String requestURI = httpServletRequest.getRequestURI();
+        logger.info("post-url:{}", requestURI);
+        Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
+        logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
+        if (!(o instanceof HandlerMethod)) {
+            return true;
+        }
+        HandlerMethod handler = (HandlerMethod) o;
+        HttpLimit httpLimit = handler.getMethodAnnotation(HttpLimit.class);
+        if (httpLimit != null) {
+            String ip = getIpAddress(httpServletRequest);
+            String url = httpServletRequest.getRequestURL().toString();
+            String key = "http_limit_".concat(url);
+            key = key + ip;
+            if(RedisUtil.getCache(key)!=null){
+                this.errorResult(httpServletResponse, HaoBanErrCode.ERR_10008);
+                logger.info("过于频繁点击");
+            	return false;
+            }else{
+            	RedisUtil.setCache(key, 1, httpLimit.time());
+            }
+        }
+        return true;
+        
+    }
+
+    
+    
+    
+    
+    private String getIpAddress(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+}

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

@@ -18,6 +18,14 @@ public class AppStaffVo implements Serializable {
     private String phoneNumber;
     private String wxEnterpriseId;
     private String wxEnterpriseName;
+    private String wxUserId;
+
+	public String getWxUserId() {
+		return wxUserId;
+	}
+	public void setWxUserId(String wxUserId) {
+		this.wxUserId = wxUserId;
+	}
 	public String getStaffId() {
 		return staffId;
 	}

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

@@ -15,7 +15,14 @@ public class InfoVo implements Serializable {
     private String staffName;
     private String phoneNumber;
     private String nationcode;
+    private String wxUserId;
 
+	public String getWxUserId() {
+		return wxUserId;
+	}
+	public void setWxUserId(String wxUserId) {
+		this.wxUserId = wxUserId;
+	}
 	public String getStaffId() {
 		return staffId;
 	}

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

@@ -34,6 +34,7 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditSettingApiService" id="auditSettingApiService"/>
 	<dubbo:reference interface="com.gic.dict.api.service.ManagerDictService" id="managerDictService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService" id="applicationSettingApiService"/>
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService" id="memberUnionidRelatedApiService"/>
 	
 	
 	<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>