From c5e44d4236c4474aea006e7a7da8e013002bad79 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 19 九月 2024 17:05:35 +0800
Subject: [PATCH] 2024-09-19 朱宝民 获取开发记录接口,返回值中支付方式ID改为支付方式名称

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index e217ed6..c6b3686 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -431,23 +431,24 @@
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�-->
   <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard">
     SELECT
-    CAST(ope.id AS char) AS id ,
-    cli.name AS clientName,
-    cli.clientNum AS clientNum,
-    card.cardNum AS cardNum,
-    card.state AS state,
-    (CASE
-    WHEN card.state = 1 THEN '姝e父'
-    WHEN card.state = 2 THEN '宸叉敞閿�'
-    WHEN card.state = 3 THEN '宸叉寕澶�'
-    END) AS stateName,
-    ope.card_cost AS cardCost,
-    ope.payment_id AS paymentId,
-    (SELECT `name` FROM ba_user WHERE id =  ope.operator) AS operator,
-    ope.operate_dt AS operateDt
+        ope.id,
+        cli.name AS clientName,
+        cli.clientNum AS clientNum,
+        card.cardNum AS cardNum,
+        card.state AS state,
+        (CASE
+            WHEN card.state = 1 THEN '姝e父'
+            WHEN card.state = 2 THEN '宸叉敞閿�'
+            WHEN card.state = 3 THEN '宸叉寕澶�'
+        END) AS stateName,
+        ope.card_cost AS cardCost,
+        pay.name AS paymentName,
+        (SELECT `name` FROM ba_user WHERE id =  ope.operator) AS operator,
+        ope.operate_dt AS operateDt
     FROM se_card_operate ope
-    INNER JOIN se_client_card card ON ope.card_id = card.id
-    INNER JOIN se_client cli ON ope.client_id = cli.id
+        INNER JOIN se_client_card card ON ope.card_id = card.id
+        INNER JOIN se_client cli ON ope.client_id = cli.id
+        INNER JOIN se_payment_method pay ON pay.id = ope.payment_id
     <where>
       AND ope.operate_type = 1
       <if test = "clientName != null and clientName !=''">

--
Gitblit v1.8.0