Merge remote-tracking branch 'origin/developer' into developer

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

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

@@ -30,7 +30,7 @@ public class MemberUnionidRelatedDTO implements Serializable{
     private String externalName;
     
     private String addCreateTime;
-
+    
     private Date createTime;
 
     private Date updateTime;

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

@@ -25,9 +25,9 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
 
-	String add(String wxEnterpriseId, String selfExternalUserId, String userId1);
+	String add(String wxEnterpriseId, String selfExternalUserId, String userId1,String storeId);
 
-	void freshWxFrend(String wxEnterpriseId, String wxUserId);
+	void freshWxFrend(String wxEnterpriseId, String wxUserId,String storeId);
 
 	public void  cleanByCid(String cid);
 
@@ -40,4 +40,6 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdListAndWxEnterpriseId(List<String> userIdList, String wxEnterpriseId);
 
+	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
+
 }

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

@@ -34,7 +34,7 @@ public interface MemberUnionidRelatedMapper {
 	
 	List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
 	
-	MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("enterpriseId")String enterpriseId, 
+	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);

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

+package com.gic.haoban.manage.service.dao.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+
+public interface TabHaobanExternalClerkRelatedMapper {
+    int deleteByPrimaryKey(String externalClerkRelatedId);
+
+    int insert(TabHaobanExternalClerkRelated record);
+
+    int insertSelective(TabHaobanExternalClerkRelated record);
+
+    TabHaobanExternalClerkRelated selectByPrimaryKey(String externalClerkRelatedId);
+
+    int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record);
+
+    int updateByPrimaryKey(TabHaobanExternalClerkRelated record);
+
+	TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId")String clerkId, @Param("externalUserId")String externalUserId);
+
+	void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
+}
\ No newline at end of file

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

@@ -79,4 +79,8 @@ public interface TabHaobanStaffClerkRelationMapper {
 	void delByClerkId(@Param("clerkId")String clerkId);
 	
 	List<TabHaobanStaffClerkRelation>listByEnterpriseIdAndWxUserId(@Param("enterpriseId")String enterpriseId,@Param("wxUserId")String wxUserId);
+
+	List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffId")String staffId);
+
+	TabHaobanStaffClerkRelation getByCodeAndStoreId(String clerkCode, String storeId);
 }
\ No newline at end of file

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

@@ -29,7 +29,7 @@ public class MemberUnionidRelated implements Serializable {
     private String externalName;
     
     private String addCreateTime;
-
+    
     private static final long serialVersionUID = 1L;
 
     public String getMemberUnionidRelatedId() {
@@ -137,5 +137,4 @@ public class MemberUnionidRelated implements Serializable {
 	}
 
     
-    
 }
\ No newline at end of file

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

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TabHaobanExternalClerkRelated implements Serializable {
+    private String externalClerkRelatedId;
+
+    private String wxEnterpriseId;
+
+    private String enterpriseId;
+
+    private String storeId;
+
+    private String memberId;
+
+    private String unionid;
+    
+    private String externalUserId;
+
+    private String externalName;
+
+    private String addCreateTime;
+
+    private String memberUnionidRelatedId;
+
+    private String clerkId;
+
+    private String staffId;
+
+    private String wxUserId;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getExternalClerkRelatedId() {
+        return externalClerkRelatedId;
+    }
+
+    public void setExternalClerkRelatedId(String externalClerkRelatedId) {
+        this.externalClerkRelatedId = externalClerkRelatedId == null ? null : externalClerkRelatedId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId == null ? null : storeId.trim();
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId == null ? null : memberId.trim();
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid == null ? null : unionid.trim();
+    }
+
+    public String getExternalName() {
+        return externalName;
+    }
+
+    public void setExternalName(String externalName) {
+        this.externalName = externalName == null ? null : externalName.trim();
+    }
+
+    public String getAddCreateTime() {
+        return addCreateTime;
+    }
+
+    public void setAddCreateTime(String addCreateTime) {
+        this.addCreateTime = addCreateTime == null ? null : addCreateTime.trim();
+    }
+
+    public String getMemberUnionidRelatedId() {
+        return memberUnionidRelatedId;
+    }
+
+    public void setMemberUnionidRelatedId(String memberUnionidRelatedId) {
+        this.memberUnionidRelatedId = memberUnionidRelatedId == null ? null : memberUnionidRelatedId.trim();
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId == null ? null : clerkId.trim();
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getExternalUserId() {
+		return externalUserId;
+	}
+
+	public void setExternalUserId(String externalUserId) {
+		this.externalUserId = externalUserId;
+	}
+    
+    
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.pojo;
+
+import java.io.Serializable;
+
+public class ExternalUserPojo implements Serializable{
+	
+	private String wxEnterpriseId;
+	
+	private String name;
+	
+	private String unionId;
+	
+	private String avatar;
+	
+	private String addCreateTime;
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getUnionId() {
+		return unionId;
+	}
+
+	public void setUnionId(String unionId) {
+		this.unionId = unionId;
+	}
+
+	public String getAvatar() {
+		return avatar;
+	}
+
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
+	public String getAddCreateTime() {
+		return addCreateTime;
+	}
+
+	public void setAddCreateTime(String addCreateTime) {
+		this.addCreateTime = addCreateTime;
+	}
+	
+	
+	
+
+}

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+
+public interface ExternalClerkRelatedService {
+
+	void insert(TabHaobanExternalClerkRelated related);
+
+	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto);
+
+}

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

@@ -55,4 +55,6 @@ public interface StaffClerkRelationService {
 
 	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList);
 
+	List<StaffClerkRelationDTO> lisByStaffId(String wxEnterpriseId, String staffId);
+
 }

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

+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+
+@Service
+public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedService {
+	
+	@Autowired
+	private TabHaobanExternalClerkRelatedMapper mapper;
+
+	@Override
+	public void insert(TabHaobanExternalClerkRelated related) {
+		String clerkId = related.getClerkId();
+		String externalUserId = related.getExternalUserId();
+		TabHaobanExternalClerkRelated tab = mapper.selectByClerkIdAndExternalUserId(clerkId,externalUserId);
+		if(tab != null){
+			String uuId = StringUtil.randomUUID();
+			related.setExternalClerkRelatedId(uuId);
+			related.setCreateTime(new Date());
+			related.setUpdateTime(new Date());
+			mapper.insertSelective(related);
+		}
+		
+		
+	}
+
+	@Override
+	public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
+		mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
+		
+	}
+
+}

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

@@ -50,8 +50,8 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public MemberUnionidRelatedDTO getByParams(String wxUserId, String enterpriseId, String name, String createTime) {
-		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByParams(wxUserId,enterpriseId,name,createTime));
+	public MemberUnionidRelatedDTO getByParams(String wxUserId, String wxEnterpriseId, String name, String createTime) {
+		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByParams(wxUserId,wxEnterpriseId,name,createTime));
 	}
 
 	@Override

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

@@ -144,4 +144,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 		}
 		return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class,mapper.listByClerkIds(clerkList));
 	}
+	@Override
+	public List<StaffClerkRelationDTO> lisByStaffId(String wxEnterpriseId, String staffId) {
+		return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId));
+	}
 }

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

@@ -483,6 +483,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 
 	@Override
 	public void wxGetAdd(String userId,String wxEnterpriseId){
+		RedisUtil.lock("haoban_add_user" + wxEnterpriseId + userId, 2l);
 		ServiceResponse wxSaveNew = getWxSaveNew(userId, wxEnterpriseId);
 		logger.info("信息:{}",JSONObject.toJSONString(wxSaveNew));
 	}

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

@@ -256,7 +256,7 @@
     from tab_haoban_member_unionid_related
     where wx_user_id = #{wxUserId}
     and status_flag = 1
-    and enterprise_id = #{enterpriseId}
+    and wx_enterprise_id = #{wxEnterpriseId}
     and external_name = #{externalName}
     and add_create_time = #{addCreateTime}
   </select>

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

@@ -338,4 +338,26 @@
     and wx_user_id = #{wxUserId}
   </select>
   
+  <select id="lisByStaffId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where 
+    wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+    and staff_id = #{staffId}
+    and status_flag = 1
+    order by create_time desc
+  </select>
+  
+  <select id="getByCodeAndStoreId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where 
+    clerk_code = #{clerkCode}
+    and store_id = #{storeId}
+    and status_flag = 1
+  </select>
+  
+  
 </mapper>
\ No newline at end of file

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

@@ -423,7 +423,7 @@ public class ClerkController extends WebBaseController{
 		Integer count =  RedisUtil.getCache(key) == null ? 0 : (Integer)RedisUtil.getCache(key);
 		if(count == null || count < 4){
 			RedisUtil.setCache(key,count + 1,31 * 24 * 60 * 60l);
-			memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId());
+			memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId(),storeId);
 			
 		}else{
 			return resultResponse(HaoBanErrCode.ERR_10011);