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

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

@@ -11,6 +11,15 @@ 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);

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

@@ -245,6 +245,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		return result;
 	}
+
+	/**
+	 * 根据导购导购微信id和会员id查询关联关系
+	 *
+	 * @return : 返回关联关系
+	 */
+	@Override
+	public ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId) {
+		return externalClerkRelatedService.getByMemberId(wxUserId, memberId);
+	}
+
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
 		TabHaobanStaff staff = staffService.selectById(staffId);