From 780454d2e277768420edf953c2243829f522560f Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 5 Mar 2024 16:41:56 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E7=94=B5=E5=8D=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/uniapp/AuthCardController.java        |  1 +
 .../mapper/pile/PileAuthCardMapper.xml        | 33 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java
index f75689710..1a6d1d1ea 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/AuthCardController.java
@@ -36,6 +36,7 @@ public class AuthCardController extends BaseController {
 
     /**
      * 查询鉴权卡列表
+     * 页面：电卡列表
      * http://localhost:8080/uniapp/authCard/getAuthCardList
      * @param request
      * @return
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
index 1b639f6b2..71db707b9 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
@@ -606,21 +606,20 @@
         </if>
     </select>
 
-    <select id="getAuthCardListByMemberId" resultType="com.jsowell.pile.vo.uniapp.AuthCardVO">
-        SELECT
-            t1.logic_card AS logicCard,
-            t1.status,
-            t1.member_id AS memberId,
-            t3.principal_balance AS principalBalance,
-            t3.gift_balance AS giftBalance,
-            t1.create_time AS createTime,
-            t2.mobile_number AS phoneNumber
-        FROM
-            pile_auth_card t1
-        JOIN member_basic_info t2 ON t1.member_id = t2.member_id
-        JOIN member_wallet_info t3 ON t2.member_id = t3.member_id
-        WHERE
-            t1.del_flag = '0'
-          AND t1.member_id = #{memberId,jdbcType=VARCHAR}
-    </select>
+  <select id="getAuthCardListByMemberId" resultType="com.jsowell.pile.vo.uniapp.AuthCardVO">
+    SELECT t1.member_id         AS memberId,
+           t1.mobile_number     AS phoneNumber,
+           t2.logic_card        AS logicCard,
+           t2.status            as status,
+           t3.wallet_code       AS walletCode,
+           t3.merchant_id       as merchantId,
+           t3.principal_balance AS principalBalance,
+           t3.gift_balance      AS giftBalance,
+           t2.create_time       AS createTime
+    FROM member_basic_info t1
+           JOIN pile_auth_card t2 ON t1.member_id = t2.member_id and t2.del_flag = '0'
+           JOIN member_wallet_info t3 ON t2.member_id = t3.member_id AND t3.merchant_id = t2.merchant_id
+    WHERE t1.del_flag = '0'
+      AND t1.member_id = #{memberId,jdbcType=VARCHAR};
+  </select>
 </mapper>
\ No newline at end of file