From d4da9210f2bf5fd1ed533cb9a94af6b114349ce4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 08 七月 2024 20:24:42 +0800
Subject: [PATCH] 2024-07-08 朱宝民 优化营销接口,支持10位水卡编号

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 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 c734f5c..6168066 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -68,7 +68,7 @@
   <select id="getCardNumOfMax"  resultType="java.lang.String">
     SELECT cardNum
     FROM se_client_card
-    WHERE cardNum LIKE CONCAT('%',#{areaCode},'%')
+    WHERE cardNum LIKE CONCAT(#{areaCode},'%')
     ORDER BY cardNum desc
     LIMIT 0,1
   </select>
@@ -344,8 +344,9 @@
     SELECT
         COUNT(*) AS recordCount
     FROM se_client_card card
-        INNER JOIN se_client cli ON card.clientId = cli.id
+      INNER JOIN se_client cli ON card.clientId = cli.id
     <where>
+      AND card.state = 1
       <if test = "clientNum != null and clientNum !=''">
         AND cli.clientNum like CONCAT('%',#{clientNum},'%')
       </if>
@@ -365,10 +366,11 @@
     SELECT
         cli.clientNum,
         cli.name AS clientName,
-        CASE
-            WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
-            ELSE card.cardNum
-        END AS cardNum,
+        cardNum,
+<!--        CASE-->
+<!--            WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!--            ELSE card.cardNum-->
+<!--        END AS cardNum,-->
         cli.phone,
         cli.idCard,
         card.state AS cardState,
@@ -418,20 +420,20 @@
     SELECT
         cli.clientNum,
         cli.name AS clientName,
-        card.cardNum,
+        cardNum,
+<!--        CASE-->
+<!--          WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!--          ELSE card.cardNum-->
+<!--        END AS cardNum,-->
         cli.phone,
         cli.idCard,
         card.state AS cardState,
-        (CASE
-            WHEN card.state = 1 THEN '姝e父'
-            WHEN card.state = 2 THEN '宸叉敞閿�'
-            WHEN card.state = 3 THEN '宸叉寕澶�'
-        End) AS stateName,
+        '宸叉寕澶�' AS stateName,
         '鍐滄埛鍗�' AS cardType,
         FORMAT(card.money,2) AS money
     FROM se_client_card card
         INNER JOIN se_client cli ON card.clientId = cli.id
-    WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.cardNum)
+    WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.id)
     ORDER BY card.id
     <trim prefix="limit " >
       <if test="start != null and count != null">

--
Gitblit v1.8.0