diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java index 5a794f150..a12b5cb83 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java @@ -119,5 +119,5 @@ public interface MemberBasicInfoMapper { */ List getMerchantListByAuth(@Param("deptIds") List deptIds); - List queryMerchantVipList(@Param("merchantIdList") List merchantIdList); + List queryMerchantVipList(@Param("merchantIdList") List merchantIdList, @Param("dto") QueryMemberInfoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index d3bc90712..0bbb120a8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -488,7 +488,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); List merchantIdList = merchantInfoVOList.stream() .map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); - List resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList); + List resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto); return resultList; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index a62aff133..b220c42bf 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -272,5 +272,9 @@ #{merchantId,jdbcType=VARCHAR} + + and t2.mobile_number like '%${dto.mobileNumber}%' + + and t2.member_id like '%${dto.memberId}%' \ No newline at end of file diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue index 90343a18e..ac1c37efd 100644 --- a/jsowell-ui/src/views/member/merchantVIP/index.vue +++ b/jsowell-ui/src/views/member/merchantVIP/index.vue @@ -280,6 +280,8 @@ export default { rules: {}, // 开卡参数 createMerchantVip: {}, + // 充值/扣款 + updateMerchantVip: {}, }; }, computed: {