diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java index dd64d6c13..7d7475fd2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java @@ -80,7 +80,7 @@ public interface MemberGroupMapper { MemberGroupVO queryByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId); - List queryMemberList(@Param("groupCode") String groupCode); + List queryMemberList(MemberGroupDTO dto); MemberGroup selectByGroupCode(String groupCode); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index e0a50aafc..7e18ed938 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -386,7 +386,10 @@ public class MemberGroupServiceImpl implements MemberGroupService { @Override public List queryMemberList(MemberGroupDTO dto) { - List list = memberGroupMapper.queryMemberList(dto.getGroupCode()); + if (dto.getGroupCode().isEmpty()){ + return null; + } + List list = memberGroupMapper.queryMemberList(dto); return list; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index cccf2984e..982fae8ed 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -19,7 +19,7 @@ - + id, group_name, group_code, merchant_id, station_id, group_level, group_type, discount, create_by, create_time, update_by, update_time, del_flag @@ -165,8 +165,14 @@ FROM member_basic_info t1 JOIN member_group_relation t2 ON t2.member_id = t1.member_id and t2.del_flag = '0' - where - t2.group_code = #{groupCode,jdbcType=VARCHAR} + WHERE t1.del_flag = '0' + AND t2.group_code = #{groupCode} + + AND t1.mobile_number LIKE CONCAT('%', #{phoneNumber}, '%') + + + AND t2.member_id = #{memberId} + - \ No newline at end of file +