Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -26,6 +26,8 @@ public interface MemberUnionidRelatedMapper {
 
     MemberUnionidRelated getByUnionId(@Param("wxUserId")String wxUserId, @Param("unionid")String unionid);
 
+    MemberUnionidRelated getByMemberId(@Param("wxUserId")String wxUserId, @Param("memberId")String memberId);
+
 	void deleteByUnionidAndUserId(@Param("externalUserid")String externalUserid,@Param("wxUserId") String wxUserId);
 
 	List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);

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

@@ -9,6 +9,8 @@ public interface MemberUnionRelatedService {
 
 	MemberUnionidRelatedDTO getByUnionId(String wxUserId, String unionid);
 	
+	MemberUnionidRelatedDTO getByMemberId(String wxUserId, String memberId);
+	
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 	
 	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);

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

@@ -25,7 +25,10 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	public MemberUnionidRelatedDTO getByUnionId(String wxUserId, String unionid) {
 		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByUnionId(wxUserId,unionid));
 	}
-
+	@Override
+	public MemberUnionidRelatedDTO getByMemberId(String wxUserId, String memberId) {
+		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByMemberId(wxUserId,memberId));
+	}
 	@Override
 	public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
 		dto.setStatusFlag(1);

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

@@ -623,8 +623,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	}
 	@Override
 	public MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId) {
-		
-		return null;
+		TabHaobanStaff staff = staffService.selectById(staffId);
+		if(staff == null){
+			return null;
+		}
+		log.info("【查询会员】wxUserId={},unionid={}",staff.getWxUserId(),memberId);
+		return memberUnionRelatedService.getByMemberId(staff.getWxUserId(),memberId);
 	}
 	@Override
 	public List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId) {

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

@@ -205,6 +205,16 @@
     limit 1
   </select>
   
+    <select id="getByMemberId" 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 member_id = #{memberId}
+    limit 1
+  </select>
+  
   <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
     update tab_haoban_member_unionid_related
     set status_flag = 0