From 8bcb47b7ea268061f4629e0953de4e3597fca690 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 七月 2024 22:16:53 +0800
Subject: [PATCH] 2024-07-16 朱宝民

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 00047cf..8baa1e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -240,7 +240,7 @@
     INNER JOIN ba_user us ON ope.operator = us.id
     Left JOIN se_payment_method pay ON ope.payment_id = pay.id
     <where>
-      AND ope.operate_type in(2, 5)
+      AND ope.operate_type in(1, 2, 5)
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
@@ -274,10 +274,11 @@
       cli.clientNum,
       cli.address,
       card.money,
-      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,-->
       IFNULL(ope.card_cost,0) AS cardCost,
       IFNULL(ope.trade_amount, 0) AS amount,
       IFNULL(ope.refund_amount, 0) AS refundAmount,
@@ -689,5 +690,7 @@
       AND ope.operate_type = 6
       AND card.cardNum = #{cardNum}
     </where>
+    ORDER BY ope.operate_dt DESC
+    LIMIT 0,1
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0