refactor(ticket): 重构订单管理界面和地址修改逻辑

- 移除30天地址修改冷却限制功能
- 删除相关的历史订单查询和地址锁定逻辑
- 将订单状态检查逻辑简化为统一的待配送检查函数
- 在编辑模式下验证订单是否可修改
- 调整按钮文本从"去购买水票"改为"确定下单"
- 优化订单操作按钮的位置和显示逻辑
- 移除地址修改限制相关的UI提示和状态管理

src/user/ticket/index.tsx

@@ -37,6 +37,7 @@ const UserTicketList = () => {
   const [orderHasMore, setOrderHasMore] = useState(true);
   const [orderPage, setOrderPage] = useState(1);
   const [orderTotal, setOrderTotal] = useState(0);
+  const [orderCancelLoadingById, setOrderCancelLoadingById] = useState<Record<number, boolean>>({});
 
   const [activeTab, setActiveTab] = useState<'ticket' | 'order'>(() => {
     const tab = Taro.getCurrentInstance().router?.params?.tab
@@ -320,40 +321,85 @@ const UserTicketList = () => {
     return Number.isFinite(computed) ? computed : 0;
   };
 
+  const getTicketUsedQty = (t?: Partial<GltUserTicket> | null) => {
+    if (!t) return 0;
+    const anyT: any = t;
+    const raw = anyT.usedQty ?? anyT.usedNum ?? anyT.usedCount;
+    const n = Number(raw);
+    return Number.isFinite(n) ? n : 0;
+  };
+
   const rollbackUserTicketAfterOrderCancel = async (order: GltTicketOrder, before?: GltUserTicket | null) => {
+    const orderId = Number(order?.id);
     const ticketId = Number(order?.userTicketId);
     const qty = Math.max(0, Math.floor(Number((order as any)?.totalNum ?? 0)));
+    if (!Number.isFinite(orderId) || orderId <= 0) return;
     if (!Number.isFinite(ticketId) || ticketId <= 0) return;
     if (!Number.isFinite(qty) || qty <= 0) return;
 
+    const rollbackKey = `glt_ticket_order_rollback:${orderId}`;
+    if (Taro.getStorageSync(rollbackKey)) return;
+
     const after = await getGltUserTicket(ticketId);
     if (!after?.id) return;
 
     const beforeAvail = before ? getTicketAvailableQty(before) : undefined;
     const afterAvail = getTicketAvailableQty(after);
+    const beforeUsed = before ? getTicketUsedQty(before) : undefined;
+    const afterUsed = getTicketUsedQty(after);
 
-    let need = qty;
+    let needAvail = qty;
     if (typeof beforeAvail === 'number') {
       const delta = afterAvail - beforeAvail;
-      if (delta >= qty) return; // backend already rolled back
+      if (delta >= qty) {
-      if (delta > 0) need = Math.max(0, qty - delta);
+        Taro.setStorageSync(rollbackKey, Date.now());
+        return; // backend already rolled back
+      }
+      if (delta > 0) needAvail = Math.max(0, qty - delta);
+    }
+    let needUsed = qty;
+    if (typeof beforeUsed === 'number') {
+      const delta = beforeUsed - afterUsed;
+      if (delta >= qty) {
+        needUsed = 0; // backend already rolled back used qty
+      } else if (delta > 0) {
+        needUsed = Math.max(0, qty - delta);
+      }
+    }
+
+    if (needAvail <= 0 && needUsed <= 0) {
+      Taro.setStorageSync(rollbackKey, Date.now());
+      return;
     }
-    if (need <= 0) return;
 
     const currentAvailRaw = Number((after as any)?.availableQty);
     const baseAvail = Number.isFinite(currentAvailRaw) ? currentAvailRaw : afterAvail;
-    const nextAvail = (Number.isFinite(baseAvail) ? baseAvail : 0) + need;
+    const safeBaseAvail = Number.isFinite(baseAvail) ? baseAvail : 0;
 
+    const totalRaw = Number((after as any)?.totalQty ?? 0);
+    const total = Number.isFinite(totalRaw) ? totalRaw : undefined;
     const frozenRaw = Number((after as any)?.frozenQty ?? 0);
     const frozen = Number.isFinite(frozenRaw) ? frozenRaw : 0;
-    const reduceFrozen = Math.min(frozen, need);
+
-    const nextFrozen = reduceFrozen > 0 ? Math.max(0, frozen - reduceFrozen) : undefined;
+    const currentUsedRaw = Number((after as any)?.usedQty);
+    const baseUsed = Number.isFinite(currentUsedRaw) ? currentUsedRaw : afterUsed;
+    const safeBaseUsed = Number.isFinite(baseUsed) ? baseUsed : 0;
+    let nextUsed = safeBaseUsed - needUsed;
+    if (nextUsed < 0) nextUsed = 0;
+
+    const maxAvail = typeof total === 'number' ? Math.max(0, total - frozen - nextUsed) : undefined;
+
+    let nextAvail = safeBaseAvail + needAvail;
+    if (typeof maxAvail === 'number' && Number.isFinite(maxAvail) && nextAvail > maxAvail) nextAvail = maxAvail;
+    if (nextAvail < 0) nextAvail = 0;
 
     await updateGltUserTicket({
       ...after,
       availableQty: nextAvail,
-      ...(nextFrozen !== undefined ? { frozenQty: nextFrozen } : {})
+      usedQty: nextUsed
     });
+
+    Taro.setStorageSync(rollbackKey, Date.now());
   };
 
   // Allow users to modify/cancel before delivery starts (e.g. 待派单 / 待配送).
@@ -391,6 +437,7 @@ const UserTicketList = () => {
       Taro.showToast({ title: '仅配送未开始的订单可取消', icon: 'none' });
       return;
     }
+    if (orderCancelLoadingById[order.id]) return;
 
     const modal = await Taro.showModal({
       title: '取消订单',
@@ -400,6 +447,7 @@ const UserTicketList = () => {
     if (!modal.confirm) return;
 
     try {
+      setOrderCancelLoadingById((prev) => ({ ...prev, [order.id as number]: true }));
       Taro.showLoading({ title: '取消中...' });
       let beforeTicket: GltUserTicket | null = null;
       if (order.userTicketId) {
@@ -427,6 +475,7 @@ const UserTicketList = () => {
       Taro.showToast({ title: '取消失败，请重试', icon: 'none' });
     } finally {
       Taro.hideLoading();
+      setOrderCancelLoadingById((prev) => ({ ...prev, [order.id as number]: false }));
     }
   };
 
@@ -699,31 +748,6 @@ const UserTicketList = () => {
                     <View className="mt-1">
                       <Text className="text-xs text-gray-500">下单时间：{formatDateTime(item.createTime)}</Text>
                     </View>
-                    {item.id ? (
-                      <View className="mt-3 flex justify-end gap-2">
-                        <Button
-                          size="small"
-                          disabled={!isTicketOrderPendingDelivery(item)}
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            void handleOrderModify(item);
-                          }}
-                        >
-                          修改订单
-                        </Button>
-                        <Button
-                          size="small"
-                          type="danger"
-                          disabled={!isTicketOrderPendingDelivery(item)}
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            void handleOrderCancel(item);
-                          }}
-                        >
-                          取消订单
-                        </Button>
-                      </View>
-                    ) : null}
                     {/*{item.storeName ? (*/}
                     {/*  <View className="mt-1 text-xs text-gray-500">*/}
                     {/*    <Text>门店：{item.storeName}</Text>*/}
@@ -760,6 +784,38 @@ const UserTicketList = () => {
                         </Button>
                       </View>
                     ) : null}
+
+                    {item.id ? (
+                      <View className="mt-3 flex justify-end gap-2">
+                        <Button
+                          size="small"
+                          disabled={
+                            !isTicketOrderPendingDelivery(item) ||
+                            !!orderCancelLoadingById[item.id as number]
+                          }
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            void handleOrderModify(item);
+                          }}
+                        >
+                          修改订单
+                        </Button>
+                        <Button
+                          size="small"
+                          type="danger"
+                          disabled={
+                            !isTicketOrderPendingDelivery(item) ||
+                            !!orderCancelLoadingById[item.id as number]
+                          }
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            void handleOrderCancel(item);
+                          }}
+                        >
+                          取消订单
+                        </Button>
+                      </View>
+                    ) : null}
                   </View>
                 ))}
               </View>

src/user/ticket/use.tsx

@@ -28,7 +28,6 @@ import type { GltUserTicket } from '@/api/glt/gltUserTicket/model'
 import { getGltUserTicket, listGltUserTicket } from '@/api/glt/gltUserTicket'
 import { getGltTicketTemplate, getGltTicketTemplateByGoodsId } from '@/api/glt/gltTicketTemplate'
 import { addGltTicketOrder, getGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder'
-import { pageGltTicketOrder } from '@/api/glt/gltTicketOrder'
 import type { GltTicketOrder } from '@/api/glt/gltTicketOrder/model'
 import type { ShopStoreRider } from '@/api/shop/shopStoreRider/model'
 import { listShopStoreRider } from '@/api/shop/shopStoreRider'
@@ -37,7 +36,6 @@ import { listShopStoreFence } from '@/api/shop/shopStoreFence'
 import { parseFencePoints, parseLngLatFromText, pointInAnyPolygon, pointInPolygon } from '@/utils/geofence'
 
 const DEFAULT_MIN_START_QTY = 10
-const ADDRESS_CHANGE_COOLDOWN_DAYS = 30
 
 const OrderConfirm = () => {
   const [goods, setGoods] = useState<ShopGoods | null>(null);
@@ -112,18 +110,6 @@ const OrderConfirm = () => {
     return Number.isFinite(id) && id > 0 ? id : undefined
   }, [])
 
-  type TicketAddressModifyLimit = {
-    loaded: boolean
-    canModify: boolean
-    nextAllowedText?: string
-    lockedAddressId?: number
-  }
-  const [ticketAddressModifyLimit, setTicketAddressModifyLimit] = useState<TicketAddressModifyLimit>({
-    loaded: false,
-    canModify: true,
-  })
-  const ticketAddressModifyLimitPromiseRef = useRef<Promise<TicketAddressModifyLimit> | null>(null)
-
   const parseTime = (raw?: unknown) => {
     if (raw === undefined || raw === null || raw === '') return null
     // Compatible with seconds/milliseconds timestamps.
@@ -142,111 +128,16 @@ const OrderConfirm = () => {
     return d.isBefore(today, 'day') ? today : d.startOf('day')
   }
 
-  const getOrderTime = (o?: Partial<GltTicketOrder> | null) => {
+  const isPendingDeliveryOrder = (o?: Partial<GltTicketOrder> | null) => {
-    return parseTime(o?.createTime) || parseTime(o?.updateTime)
+    if (!o) return false
-  }
+    const ds = (o as any)?.deliveryStatus
-
+    const hasProgress = !!o.sendStartTime || !!o.sendEndTime || !!o.receiveConfirmTime
-  const getOrderAddressKey = (o?: Partial<GltTicketOrder> | null) => {
+    return (
-    const id = Number(o?.addressId)
+      Number((o as any)?.deleted) !== 1 &&
-    if (Number.isFinite(id) && id > 0) return `id:${id}`
+      Number(o.status) !== 1 &&
-    const txt = String(o?.address || '').trim()
+      !hasProgress &&
-    if (txt) return `txt:${txt}`
+      (ds === 10 || (typeof ds !== 'number' && !!o.riderId))
-    return ''
+    )
-  }
-
-  const loadTicketAddressModifyLimit = async (): Promise<TicketAddressModifyLimit> => {
-    if (ticketAddressModifyLimitPromiseRef.current) return ticketAddressModifyLimitPromiseRef.current
-
-    ticketAddressModifyLimitPromiseRef.current = (async () => {
-      if (!userId) return { loaded: true, canModify: true }
-
-      const now = dayjs()
-      const pageSize = 20
-      let page = 1
-      const all: GltTicketOrder[] = []
-
-      let latestKey = ''
-      let latestAddressId: number | undefined = undefined
-
-      while (true) {
-        const res = await pageGltTicketOrder({ page, limit: pageSize, userId })
-        const list = Array.isArray(res?.list) ? res.list : []
-        if (page === 1) {
-          const first = list[0]
-          latestKey = getOrderAddressKey(first)
-          const id = Number(first?.addressId)
-          latestAddressId = Number.isFinite(id) && id > 0 ? id : undefined
-        }
-
-        if (!list.length) break
-        all.push(...list)
-
-        // Find the oldest order in the newest contiguous block of the latest address key.
-        // That order's time represents the last time user "set/changed" the ticket delivery address.
-        const currentKey = latestKey
-        if (!currentKey) {
-          return { loaded: true, canModify: true }
-        }
-
-        let lastSameIndex = 0
-        let foundDifferent = false
-        for (let i = 1; i < all.length; i++) {
-          const k = getOrderAddressKey(all[i])
-          if (!k) continue
-          if (k === currentKey) {
-            lastSameIndex = i
-            continue
-          }
-          foundDifferent = true
-          break
-        }
-
-        if (foundDifferent) {
-          const lastSetAt = getOrderTime(all[lastSameIndex])
-          if (!lastSetAt) return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-          const nextAllowed = lastSetAt.add(ADDRESS_CHANGE_COOLDOWN_DAYS, 'day')
-          const canModify = now.isAfter(nextAllowed)
-          return {
-            loaded: true,
-            canModify,
-            nextAllowedText: nextAllowed.format('YYYY-MM-DD'),
-            lockedAddressId: latestAddressId,
-          }
-        }
-
-        const oldest = getOrderTime(all[all.length - 1])
-        if (oldest && now.diff(oldest, 'day') >= ADDRESS_CHANGE_COOLDOWN_DAYS) {
-          // We have enough history beyond the cooldown window, and still no different address found.
-          return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-        }
-
-        const totalCount = typeof (res as any)?.count === 'number' ? Number((res as any).count) : undefined
-        if (totalCount !== undefined && all.length >= totalCount) break
-        if (list.length < pageSize) break
-
-        page += 1
-        if (page > 10) break // safety: avoid excessive paging
-      }
-
-      if (!all.length) return { loaded: true, canModify: true }
-
-      // If we can't prove the last-set time is older than the cooldown window, be conservative and lock.
-      const lastSetAt = getOrderTime(all[all.length - 1])
-      if (!lastSetAt) return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-      const nextAllowed = lastSetAt.add(ADDRESS_CHANGE_COOLDOWN_DAYS, 'day')
-      const canModify = now.isAfter(nextAllowed)
-      return {
-        loaded: true,
-        canModify,
-        nextAllowedText: nextAllowed.format('YYYY-MM-DD'),
-        lockedAddressId: latestAddressId,
-      }
-    })()
-      .finally(() => {
-        ticketAddressModifyLimitPromiseRef.current = null
-      })
-
-    return ticketAddressModifyLimitPromiseRef.current
   }
 
   const getTicketAvailableQty = (t?: Partial<GltUserTicket> | null) => {
@@ -363,17 +254,15 @@ const OrderConfirm = () => {
   }
 
   const openAddressPage = async () => {
-    const limit = ticketAddressModifyLimit.loaded
+    if (isEditMode) {
-      ? ticketAddressModifyLimit
+      if (!editingOrder?.id) {
-      : await loadTicketAddressModifyLimit().catch(() => ({ loaded: true, canModify: true } as TicketAddressModifyLimit))
+        Taro.showToast({ title: '订单信息加载中，请稍后重试', icon: 'none' })
-    if (!ticketAddressModifyLimit.loaded) setTicketAddressModifyLimit(limit)
+        return
-
+      }
-    if (!limit.canModify) {
+      if (!isPendingDeliveryOrder(editingOrder)) {
-      Taro.showToast({
+        Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
-        title: `送水地址每${ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次${limit.nextAllowedText ? '，' + limit.nextAllowedText + ' 后可修改' : ''}`,
+        return
-        icon: 'none',
+      }
-      })
-      return
     }
     Taro.navigateTo({ url: '/user/address/index' })
   }
@@ -662,27 +551,12 @@ const OrderConfirm = () => {
       Taro.showToast({ title: '订单信息加载中，请稍后重试', icon: 'none' })
       return
     }
-    if (!address?.id) {
+    if (isEditMode && !isPendingDeliveryOrder(editingOrder)) {
-      Taro.showToast({ title: '请选择收货地址', icon: 'none' })
+      Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
       return
     }
-
+    if (!address?.id) {
-    // Ticket delivery address is based on order snapshot. Enforce "once per 30 days" by latest ticket-order history.
+      Taro.showToast({ title: '请选择收货地址', icon: 'none' })
-    const limit = ticketAddressModifyLimit.loaded
-      ? ticketAddressModifyLimit
-      : await loadTicketAddressModifyLimit().catch(() => ({ loaded: true, canModify: true } as TicketAddressModifyLimit))
-    if (!ticketAddressModifyLimit.loaded) setTicketAddressModifyLimit(limit)
-    if (!limit.canModify && limit.lockedAddressId && address.id !== limit.lockedAddressId) {
-      Taro.showToast({
-        title: `送水地址每${ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次，请使用上次下单地址${limit.nextAllowedText ? '（' + limit.nextAllowedText + ' 后可修改）' : ''}`,
-        icon: 'none',
-      })
-      try {
-        const locked = await getShopUserAddress(limit.lockedAddressId)
-        if (locked?.id) setAddress(locked)
-      } catch (_e) {
-        // ignore: keep current address, but still block submission
-      }
       return
     }
     if (!addressHasCoords) {
@@ -861,13 +735,7 @@ const OrderConfirm = () => {
         setEditingOrder(editingOrderRes)
         Taro.setNavigationBarTitle({ title: '订单确认' })
 
-        const ds = editingOrderRes.deliveryStatus
+        const isPending = isPendingDeliveryOrder(editingOrderRes)
-        const hasProgress = !!editingOrderRes.sendStartTime || !!editingOrderRes.sendEndTime || !!editingOrderRes.receiveConfirmTime
-        const isPending =
-          Number((editingOrderRes as any)?.deleted) !== 1 &&
-          Number(editingOrderRes.status) !== 1 &&
-          !hasProgress &&
-          (ds === 10 || (typeof ds !== 'number' && !!editingOrderRes.riderId))
         if (!isPending) {
           Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
           setTimeout(() => {
@@ -898,20 +766,6 @@ const OrderConfirm = () => {
           }
         }
       }
-
-      // Load ticket-order history to enforce "address can be modified once per 30 days".
-      // If currently locked, force using last ticket-order address (snapshot) to avoid getting stuck with a new default address.
-      try {
-        const limit = await loadTicketAddressModifyLimit()
-        setTicketAddressModifyLimit(limit)
-        if (!limit.canModify && limit.lockedAddressId) {
-          const locked = await getShopUserAddress(limit.lockedAddressId)
-          if (locked?.id) setAddress(locked)
-        }
-      } catch (e) {
-        console.error('加载送水地址修改限制失败:', e)
-        setTicketAddressModifyLimit({ loaded: true, canModify: true })
-      }
       // Tickets are non-blocking for first paint; load in background.
       loadUserTickets()
     } catch (err) {
@@ -989,10 +843,6 @@ const OrderConfirm = () => {
   // When user changes the delivery address to an out-of-fence one, prompt immediately (once per address).
   const outOfRangePromptedAddressIdRef = useRef<number | undefined>(undefined)
   useEffect(() => {
-    // Only prompt when user is allowed to change the ticket delivery address.
-    // Otherwise this toast is noisy (they can't fix it within the cooldown window).
-    if (!ticketAddressModifyLimit.loaded) return
-    if (!ticketAddressModifyLimit.canModify) return
     const id = address?.id
     if (!id) return
     if (deliveryRangeCheckedAddressId !== id) return
@@ -1004,9 +854,7 @@ const OrderConfirm = () => {
     address?.id,
     addressHasCoords,
     deliveryRangeCheckedAddressId,
-    inDeliveryRange,
+    inDeliveryRange
-    ticketAddressModifyLimit.loaded,
-    ticketAddressModifyLimit.canModify
   ])
 
   // When tickets/stock change, clamp quantity into [0..maxQuantity].
@@ -1145,12 +993,6 @@ const OrderConfirm = () => {
                   </Space>
 	                  <View className={'pt-1 pb-3'}>
 	                    <View className={'text-gray-500'}>{address.name} {address.phone}</View>
-	                    {ticketAddressModifyLimit.loaded && !ticketAddressModifyLimit.canModify && (
-	                      <View className={'pt-1 text-xs text-orange-500 hidden'}>
-	                        送水地址每{ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次
-	                        {ticketAddressModifyLimit.nextAllowedText ? `，${ticketAddressModifyLimit.nextAllowedText} 后可修改` : ''}
-	                      </View>
-	                    )}
 	                  </View>
 	                </View>
 	              </Space>
@@ -1342,7 +1184,7 @@ const OrderConfirm = () => {
                   <Empty description="暂无可用水票" />
                   <View className="mt-4 flex justify-center">
                     <Button type="primary" onClick={goBuyTickets}>
-                      去购买水票
+                      确定下单
                     </Button>
                   </View>
                 </View>
@@ -1426,7 +1268,7 @@ const OrderConfirm = () => {
 	          <div className={'buy-btn mx-4'}>
               {noUsableTickets ? (
                 <Button type="primary" size="large" onClick={goBuyTickets}>
-                  去购买水票
+                  确定下单
                 </Button>
               ) : (
 	                <Button