From f87f2f517681f6201bc392393c43dd66afaf718c Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 21 Apr 2026 10:36:55 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=97=B6=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/mapper/MemberWalletInfoMapper.java   |  2 ++
 .../service/impl/MemberWalletInfoServiceImpl.java     | 10 +++++++++-
 .../resources/mapper/pile/MemberWalletInfoMapper.xml  | 11 +++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
index 34faa8443..386913244 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
@@ -38,6 +38,8 @@ public interface MemberWalletInfoMapper {
      */
     MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
 
+    List<MemberWalletInfo> selectByMemberIdList(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
+
     List<MemberWalletInfo> selectByMemberWalletList(@Param("memberId") String memberId);
 
     MemberWalletInfo selectByWalletCode(@Param("walletCode") String walletCode);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
index 37201480f..4be888a50 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
@@ -46,7 +46,15 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
 
     @Override
     public MemberWalletInfo selectByMemberId(String memberId, String merchantId) {
-        return memberWalletInfoMapper.selectByMemberId(memberId, merchantId);
+        List<MemberWalletInfo> list = memberWalletInfoMapper.selectByMemberIdList(memberId, merchantId);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        // 优先返回 merchantId 不为空的记录，避免脏数据干扰
+        return list.stream()
+                .filter(w -> w.getMerchantId() != null)
+                .findFirst()
+                .orElse(list.get(0));
     }
 
     @Override
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml
index 352b6a218..8f5cc314b 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml
@@ -528,6 +528,17 @@
 
   </select>
 
+  <select id="selectByMemberIdList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from member_wallet_info
+    where del_flag = '0'
+    and member_id = #{memberId,jdbcType=INTEGER}
+    <if test="merchantId != null">
+      and merchant_id = #{merchantId,jdbcType=VARCHAR}
+    </if>
+  </select>
+
   <select id="selectByMemberWalletList" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />