From 2c076e2b0fc5ee3dcb484d052607d87b10f67109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Feb 2026 00:15:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E9=80=81?=
 =?UTF-8?q?=E6=B0=B4=E8=AE=A2=E5=8D=95=E9=85=8D=E9=80=81=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E5=AE=8C=E6=95=B4=E4=B8=8B=E5=8D=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在GltTicketOrder实体中新增sendTime字段用于记录配送时间
- 移除送水订单查询接口的权限验证要求，开放查询功能
- 实现完整的下单流程：验证登录用户、扣减水票、写入核销记录、创建订单
- 新增createWithWriteOff方法处理事务性下单操作，确保数据一致性
- 添加数据库行锁机制防止并发扣减问题
- 优化水票相关接口描述，明确为可用水票总数
- 移除水票日志添加接口的权限验证和操作日志注解
---
 .../com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml  | 8 +++++---
 .../com/gxwebsoft/glt/service/GltUserTicketService.java   | 7 ++++---
 .../glt/service/impl/GltUserTicketServiceImpl.java        | 6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml
index a7a3d88..c0f6ef0 100644
--- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml
+++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml
@@ -87,11 +87,13 @@
         <include refid="selectSql"></include>
     </select>
 
-    <!-- 我的水票总数（sum(total_qty)） -->
-    <select id="sumTotalQtyByUserId" resultType="java.lang.Integer">
-        SELECT IFNULL(SUM(total_qty), 0)
+    <!-- 我的可用水票总数（sum(available_qty)） -->
+    <select id="sumAvailableQtyByUserId" resultType="java.lang.Integer">
+        SELECT IFNULL(SUM(available_qty), 0)
         FROM glt_user_ticket
         WHERE user_id = #{userId}
+          AND tenant_id = #{tenantId}
+          AND status = 0
           AND deleted = 0
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java
index 1c292e9..615ef75 100644
--- a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java
+++ b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java
@@ -40,11 +40,12 @@ public interface GltUserTicketService extends IService<GltUserTicket> {
     GltUserTicket getByIdRel(Integer id);
 
     /**
-     * 统计指定用户水票总数量（sum(total_qty)）
+     * 统计指定用户可用水票总数（sum(available_qty)）
      *
      * @param userId 用户ID
-     * @return 总数量（无记录返回0）
+     * @param tenantId 租户ID
+     * @return 可用总数（无记录返回0）
      */
-    Integer sumTotalQtyByUserId(Integer userId);
+    Integer sumAvailableQtyByUserId(Integer userId, Integer tenantId);
 
 }
diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java
index 06b171f..d5547a9 100644
--- a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java
@@ -45,9 +45,9 @@ public class GltUserTicketServiceImpl extends ServiceImpl<GltUserTicketMapper, G
     }
 
     @Override
-    public Integer sumTotalQtyByUserId(Integer userId) {
-        Integer totalQty = baseMapper.sumTotalQtyByUserId(userId);
-        return totalQty == null ? 0 : totalQty;
+    public Integer sumAvailableQtyByUserId(Integer userId, Integer tenantId) {
+        Integer availableQty = baseMapper.sumAvailableQtyByUserId(userId, tenantId);
+        return availableQty == null ? 0 : availableQty;
     }
 
 }