From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 六月 2025 08:57:39 +0800
Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化；2、表阀一体机功能码92返回结果判断bug修改；3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 dfa7059..6bc3433 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -168,11 +168,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateVcCardNoUseStateByIntakeId" parameterType="java.lang.Long">
+  <update id="updateVcCardNoUseStateByIntakeId">
     update se_virtual_card
     set in_use = 0,
       intake_id = null
-    where intake_id = #{intakeId,jdbcType=BIGINT}
+    where intake_id = #{intakeId,jdbcType=BIGINT} and open_time &lt; #{now,jdbcType=TIMESTAMP}
   </update>
   <update id="updateMoney" >
     update se_virtual_card
@@ -245,11 +245,12 @@
     SELECT id FROM se_virtual_card WHERE state = 1 AND vc_num = #{vcNum}
   </select>
 
-  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID-->
+  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栧啘鎴穒d銆佸鍚嶃�佸湴鍧�-->
   <select id="getClientIdAndNameByVsCardNo" resultType="java.util.Map">
     SELECT
     cli.id AS clientId,
-    cli.name AS clientName
+    cli.name AS clientName,
+    cli.address AS clientAddress
     FROM se_virtual_card card
     INNER JOIN se_client cli ON card.client_id = cli.id
     WHERE card.state = 1 AND card.vc_num = #{vcNum}

--
Gitblit v1.8.0