From 6dd90a95c5dff764f7ea6e8f61a36fc0e3bf6aa3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 17:20:10 +0800
Subject: [PATCH] 优化接口 获得一个取水口接口 优化传参方式、增加片区名称和地址两个字段

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 1b18b3c..2753352 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -349,28 +349,30 @@
     <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級-->
     <select id="getCardInfoByClientId" resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo">
         SELECT *
-        FROM (SELECT '鐗╃悊鍗�'        AS cardType,
-                     card.cardNum AS cardNum,
-                     card.money   AS money,
-                     (CASE
-                          WHEN card.state = 1 THEN '姝e父'
-                          WHEN card.state = 2 THEN '宸叉敞閿�'
-                          ELSE '宸叉寕澶�'
-                         END)     AS state
+        FROM (SELECT
+                '鐗╃悊鍗�' AS cardType,
+                card.cardNum AS cardNum,
+                card.money   AS money,
+                (CASE
+                    WHEN card.state = 1 THEN '姝e父'
+                    WHEN card.state = 2 THEN '宸叉敞閿�'
+                    ELSE '宸叉寕澶�'
+                END) AS state
               FROM se_client_card card
-                       INNER JOIN se_client cli ON cli.id = card.clientId
+                INNER JOIN se_client cli ON cli.id = card.clientId
               WHERE state != 4 AND card.clientId = #{clientId,jdbcType=BIGINT}
               UNION ALL
-              SELECT '铏氭嫙鍗�'     AS cardType,
-                     vc.vc_num AS cardNum,
-                     vc.money  AS money,
-                     (CASE
-                          WHEN vc.in_use = 0 THEN '鏈娇鐢�'
-                          WHEN vc.in_use = 1 THEN '浣跨敤涓�'
-                         END)  AS state
+              SELECT
+                '铏氭嫙鍗�' AS cardType,
+                vc.vc_num AS cardNum,
+                ROUND(vc.money /100, 2)  AS money,
+                (CASE
+                    WHEN vc.in_use = 0 THEN '鏈娇鐢�'
+                    WHEN vc.in_use = 1 THEN '浣跨敤涓�'
+                END) AS state
               FROM se_virtual_card vc
-                       INNER JOIN se_client cli ON cli.id = vc.client_id
-              WHERE vc.client_id = #{clientId,jdbcType=BIGINT}
+                INNER JOIN se_client cli ON cli.id = vc.client_id
+              WHERE vc.state = 1 AND vc.client_id = #{clientId,jdbcType=BIGINT}
         ) card
         ORDER BY card.Money DESC, card.State DESC
     </select>
@@ -454,7 +456,7 @@
     <select id="getCardsCount" parameterType="java.util.Map" resultType="java.lang.Long">
         SELECT COUNT(*) AS recordCount
         FROM se_client_card card
-            INNER JOIN se_client cli ON card.clientId = cli.id
+            LEFT JOIN se_client cli ON card.clientId = cli.id
         <where>
             AND card.state = 1
             <if test="clientNum != null and clientNum != ''">
@@ -483,7 +485,7 @@
             '鍐滄埛鍗�' AS cardType,
             FORMAT(card.money, 2) AS money
         FROM se_client_card card
-            INNER JOIN se_client cli ON card.clientId = cli.id
+            LEFT JOIN se_client cli ON card.clientId = cli.id
         <where>
             AND card.state = 1
             <if test="clientNum != null and clientNum != ''">

--
Gitblit v1.8.0