From dc28ad88d48bfaf3f3de3bcaaac56979f8c136b7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 15:56:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
index cbe262b..cdc44c2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -152,6 +152,11 @@
       intake_id = null
     where intake_id = #{intakeId,jdbcType=BIGINT}
   </update>
+  <update id="updateMoney" >
+    update se_virtual_card
+    set money = #{money,jdbcType=FLOAT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
   <!--楠岃瘉鍐滄埛鏄惁鎷ユ湁鎸囧畾鍚嶇О鐨勮櫄鎷熷崱-->
   <select id="getRecordCountByName" resultType="java.lang.Integer">
     SELECT COUNT(*) AS recordCount
@@ -170,22 +175,21 @@
   <!--鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗�-->
   <select id="getVCs" resultType="com.dy.pipIrrGlobal.voSe.VoVirtualCard">
     SELECT
-<!--      CAST(id AS char) AS id,-->
       id,
       vc_num AS vcNum,
       money,
       in_use AS inUse,
       (CASE
-        WHEN in_use = 0 THEN "鏈娇鐢�"
-        WHEN in_use = 1 THEN "浣跨敤涓�"
-      END) AS inUseName
+        WHEN money &lt;= #{alarmValue} THEN true
+        ELSE FALSE
+      END) AS isAlarmValue
     FROM se_virtual_card
     <where>
       <if test = "clientId != null">
         AND client_id = #{clientId}
       </if>
     </where>
-    ORDER BY in_use, money
+    ORDER BY in_use, money DESC
   </select>
 
   <!--鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞�-->
@@ -196,8 +200,8 @@
         money,
         in_use AS inUse,
         (CASE
-            WHEN in_use = 0 THEN "鏈娇鐢�"
-            WHEN in_use = 1 THEN "浣跨敤涓�"
+            WHEN in_use = 0 THEN '鏈娇鐢�'
+            WHEN in_use = 1 THEN '浣跨敤涓�'
         END) AS inUseName
     FROM se_virtual_card
     WHERE id = #{vcId}
@@ -225,6 +229,15 @@
     WHERE card.vc_num = #{vcNum}
   </select>
 
+  <!-- 鏍规嵁姘村崱缂栧彿鑾峰彇铏氭嫙姘村崱 -->
+  <select id="getCardsByNum"  resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo1">
+    SELECT
+    id,
+    money
+    FROM se_virtual_card
+    WHERE vc_num = #{cardNum}
+  </select>
+
   <!--鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈣櫄鎷熷崱缂栧彿-->
   <select id="getVcCardNumOfMax"  resultType="java.lang.String">
     SELECT vc_num
@@ -248,14 +261,14 @@
       recharge_time AS rechargeTime,
       order_state AS orderState,
       (CASE
-      WHEN order_state = 1 THEN "鏈敮浠�"
-      WHEN order_state = 2 THEN "宸叉敮浠�"
+      WHEN order_state = 1 THEN '鏈敮浠�'
+      WHEN order_state = 2 THEN '宸叉敮浠�'
       END) AS orderStateName
     FROM se_vc_recharge
     where order_state = 2
     order by recharge_time DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+    <if test="start != null and count != null">
+      LIMIT #{start}, #{count}
     </if>
   </select>
 

--
Gitblit v1.8.0