From 165efe4e9647cc9be0c528e9eec46a5ecaba9cd2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 24 Nov 2023 16:22:45 +0800
Subject: [PATCH] =?UTF-8?q?update=E8=BF=90=E8=90=A5=E5=95=86VIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java   | 2 +-
 .../jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java | 2 +-
 .../src/main/resources/mapper/pile/MemberBasicInfoMapper.xml  | 4 ++++
 jsowell-ui/src/views/member/merchantVIP/index.vue             | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

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<MerchantInfoVO> getMerchantListByAuth(@Param("deptIds") List<String> deptIds);
 
-	List<MerchantVipVO> queryMerchantVipList(@Param("merchantIdList") List<String> merchantIdList);
+	List<MerchantVipVO> queryMerchantVipList(@Param("merchantIdList") List<String> 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<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
 		List<String> merchantIdList = merchantInfoVOList.stream()
 				.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
-		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList);
+		List<MerchantVipVO> 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 @@
         <foreach collection="merchantIdList" item="merchantId" open="(" separator="," close=")">
             #{merchantId,jdbcType=VARCHAR}
         </foreach>
+        <if test="dto.mobileNumber != null and dto.mobileNumber != ''">
+            and t2.mobile_number like '%${dto.mobileNumber}%'
+        </if>
+        <if test="dto.memberId != null and dto.memberId != ''">and t2.member_id like '%${dto.memberId}%'</if>
     </select>
 </mapper>
\ 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: {