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

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

@@ -11,10 +11,19 @@ import com.gic.haoban.manage.api.dto.*;
 
 public interface MemberUnionidRelatedApiService {
 
+    /**
+     * 根据导购导购微信id和会员id查询关联关系
+     *
+     * @param wxUserId : 导购微信id
+     * @param memberId : 会员id
+     * @return : 返回导购与会员关联关系
+     */
+	ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId);
+
 	MemberUnionidRelatedDTO getByUnionId(String staffId, String memberId);
-	
+
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
-	
+
 	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 
     /**
@@ -27,7 +36,7 @@ public interface MemberUnionidRelatedApiService {
 	ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
-	
+
 	List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
 
 	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
@@ -50,9 +59,9 @@ public interface MemberUnionidRelatedApiService {
 	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
 	void mqFreshWxFrend(String res);
-	
+
 	void cleanNoExsitFriend(String wxEnterpriseId,String wxUserId,String resWes);
-	
+
 	List<String> listSelfExterialList(String wxEnterpriseId,String wxUserId);
 
 	List<String> listExterialList(String wxEnterpriseId, String wxUserId);