feat(order): 增加订单确认页面数量步长控制功能

- 在订单确认页面实现商品购买数量的步长控制机制
- 添加了商品模型中的step字段支持，用于定义购买步长
- 实现了水票套票模板的step配置和最小购买数量逻辑
- 优化了订单参数解析逻辑，支持orderData模式下的商品规格信息传递
- 更新了API基础URL配置，切换到新的测试服务器地址
- 在下单接口中增加了skuId和specInfo参数传递支持
- 完善了数量变更时的价格计算和库存限制逻辑

config/env.ts

@@ -2,21 +2,21 @@
 export const ENV_CONFIG = {
   // 开发环境
   development: {
-    // API_BASE_URL: 'http://127.0.0.1:9200/api',
+    API_BASE_URL: 'http://127.0.0.1:9200/api',
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    // API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '开发环境',
     DEBUG: 'true',
   },
   // 生产环境
   production: {
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '桂乐淘',
     DEBUG: 'false',
   },
   // 测试环境
   test: {
     // API_BASE_URL: 'http://127.0.0.1:9200/api',
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '测试环境',
     DEBUG: 'true',
   }

src/api/glt/gltTicketTemplate/model/index.ts

@@ -16,6 +16,8 @@ export interface GltTicketTemplate {
   unitName?: string;
   // 最小购买数量
   minBuyQty?: number;
+  // 购买步长（如：5 的倍数）
+  step?: number;
   // 起始发送数量
   startSendQty?: number;
   // 买赠：买1送4 => gift_multiplier=4

src/api/shop/shopGoods/model/index.ts

@@ -81,6 +81,8 @@ export interface ShopGoods {
   isNew?: number;
   // 库存
   stock?: number;
+  // 步长
+  step?: number;
   // 商品重量
   goodsWeight?: number;
   // 消费赚取积分

src/shop/orderConfirm/index.tsx

@@ -1,4 +1,4 @@
-import {useEffect, useState} from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
   Image,
   Button,
@@ -82,17 +82,62 @@ const OrderConfirm = () => {
   const [selectedStore, setSelectedStore] = useState<ShopStore | null>(getSelectedStoreFromStorage())
 
   const router = Taro.getCurrentInstance().router;
-  const goodsId = router?.params?.goodsId;
+  const params = router?.params || ({} as Record<string, any>)
+  const goodsIdParam = params?.goodsId
+  const orderDataRaw = params?.orderData
+
+  type OrderDataParam = {
+    goodsId?: number | string
+    skuId?: number | string
+    quantity?: number | string
+    price?: number | string
+    specInfo?: string
+  }
+
+  const orderDataParam: OrderDataParam | null = useMemo(() => {
+    if (!orderDataRaw) return null
+    const rawText = String(orderDataRaw)
+    try {
+      return JSON.parse(decodeURIComponent(rawText)) as OrderDataParam
+    } catch (_e1) {
+      try {
+        return JSON.parse(rawText) as OrderDataParam
+      } catch (_e2) {
+        console.error('orderData 参数解析失败:', orderDataRaw)
+        return null
+      }
+    }
+  }, [orderDataRaw])
+
+  const resolvedGoodsId = (() => {
+    const id1 = Number(goodsIdParam)
+    if (Number.isFinite(id1) && id1 > 0) return id1
+    const id2 = Number(orderDataParam?.goodsId)
+    if (Number.isFinite(id2) && id2 > 0) return id2
+    return undefined
+  })()
+
+  const resolvedSkuId = (() => {
+    const n = Number(orderDataParam?.skuId)
+    return Number.isFinite(n) && n > 0 ? n : undefined
+  })()
+
+  const quantityFromParam = (() => {
+    const n = Number(orderDataParam?.quantity)
+    return Number.isFinite(n) && n > 0 ? Math.floor(n) : undefined
+  })()
 
   // 页面级兜底：未登录直接进入下单页时，引导去注册/登录并回跳
   useEffect(() => {
-    if (!goodsId) {
+    // 兼容 goodsId / orderData 两种进入方式（goodsDetail 有规格时会走 orderData）
-      // 也可能是 orderData 模式；这里只做最小兜底
+    const backUrl =
-      if (!ensureLoggedIn('/shop/orderConfirm/index')) return
+      orderDataRaw
-      return
+        ? `/shop/orderConfirm/index?orderData=${orderDataRaw}`
-    }
+        : resolvedGoodsId
-    if (!ensureLoggedIn(`/shop/orderConfirm/index?goodsId=${goodsId}`)) return
+          ? `/shop/orderConfirm/index?goodsId=${resolvedGoodsId}`
-  }, [goodsId])
+          : '/shop/orderConfirm/index'
+    if (!ensureLoggedIn(backUrl)) return
+  }, [resolvedGoodsId, orderDataRaw])
 
   const isTicketTemplateActive =
     !!ticketTemplate &&
@@ -142,7 +187,9 @@ const OrderConfirm = () => {
   // 计算商品总价
   const getGoodsTotal = () => {
     if (!goods) return 0
-    const price = parseFloat(goods.price || '0')
+    const rawPrice = String(orderDataParam?.price ?? goods.price ?? '0')
+    const priceNum = parseFloat(rawPrice)
+    const price = Number.isFinite(priceNum) ? priceNum : 0
     // const total = price * quantity
 
     // 🔍 详细日志，用于排查数值精度问题
@@ -183,12 +230,21 @@ const OrderConfirm = () => {
   const handleQuantityChange = (value: string | number) => {
     const fallback = isTicketTemplateActive ? minBuyQty : 1
     const newQuantity = typeof value === 'string' ? parseInt(value, 10) || fallback : value
-    const finalQuantity = Math.max(fallback, Math.min(newQuantity, goods?.stock || 999))
+    const step = goods?.step || 1
+    const stockMax = goods?.stock ?? 999
+    const maxMultiple = step > 1 ? Math.floor(stockMax / step) * step : stockMax
+    const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+    const effectiveMin = Math.min(fallback, maxAllowed)
+    const clamped = Math.max(effectiveMin, Math.min(Number(newQuantity) || fallback, maxAllowed))
+    const snapped = step > 1 ? Math.ceil(clamped / step) * step : clamped
+    const finalQuantity = Math.max(effectiveMin, Math.min(snapped, maxAllowed))
     setQuantity(finalQuantity)
 
     // 数量变化时，重新排序优惠券并检查当前选中的优惠券是否还可用
     if (availableCoupons.length > 0) {
-      const newTotal = parseFloat(goods?.price || '0') * finalQuantity
+      const priceNum = parseFloat(String(orderDataParam?.price ?? goods?.price ?? '0'))
+      const unitPrice = Number.isFinite(priceNum) ? priceNum : 0
+      const newTotal = unitPrice * finalQuantity
       const sortedCoupons = sortCoupons(availableCoupons, newTotal)
       const usableCoupons = filterUsableCoupons(sortedCoupons, newTotal)
       setAvailableCoupons(sortedCoupons)
@@ -497,7 +553,9 @@ const OrderConfirm = () => {
                   comments: goods.name,
                   deliveryType: 0,
                   buyerRemarks: orderRemark,
-                  couponId: parseInt(String(bestCoupon.id), 10)
+                  couponId: parseInt(String(bestCoupon.id), 10),
+                  skuId: resolvedSkuId,
+                  specInfo: orderDataParam?.specInfo
                 }
               );
 
@@ -507,6 +565,7 @@ const OrderConfirm = () => {
               await PaymentHandler.pay(updatedOrderData, currentPaymentType, hasTicketTemplate ? {
                 onSuccess: async () => {
                   const id = goods.goodsId
+                  const ticketIndexUrl = `/user/ticket/index?fromPayAt=${Date.now()}`
                   try {
                     const res = await Taro.showModal({
                       title: '提示',
@@ -518,13 +577,13 @@ const OrderConfirm = () => {
                       if (id) {
                         await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
                       } else {
-                        await Taro.redirectTo({ url: '/user/ticket/index' })
+                        await Taro.redirectTo({ url: ticketIndexUrl })
                       }
                     } else {
-                      await Taro.redirectTo({ url: '/user/ticket/index' })
+                      await Taro.redirectTo({ url: ticketIndexUrl })
                     }
                   } catch (_e) {
-                    await Taro.redirectTo({ url: '/user/ticket/index' })
+                    await Taro.redirectTo({ url: ticketIndexUrl })
                   }
                   return false
                 }
@@ -547,7 +606,9 @@ const OrderConfirm = () => {
           deliveryType: 0,
           buyerRemarks: orderRemark,
           // 🔧 确保 couponId 是正确的数字类型，且不传递 undefined
-          couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined
+          couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined,
+          skuId: resolvedSkuId,
+          specInfo: orderDataParam?.specInfo
         }
       );
 
@@ -583,6 +644,7 @@ const OrderConfirm = () => {
       await PaymentHandler.pay(orderData, paymentType, hasTicketTemplate ? {
         onSuccess: async () => {
           const id = goods.goodsId
+          const ticketIndexUrl = `/user/ticket/index?fromPayAt=${Date.now()}`
           try {
             const res = await Taro.showModal({
               title: '提示',
@@ -594,13 +656,13 @@ const OrderConfirm = () => {
               if (id) {
                 await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
               } else {
-                await Taro.redirectTo({ url: '/user/ticket/index' })
+                await Taro.redirectTo({ url: ticketIndexUrl })
               }
             } else {
-              await Taro.redirectTo({ url: '/user/ticket/index' })
+              await Taro.redirectTo({ url: ticketIndexUrl })
             }
           } catch (_e) {
-            await Taro.redirectTo({ url: '/user/ticket/index' })
+            await Taro.redirectTo({ url: ticketIndexUrl })
           }
           return false
         }
@@ -682,8 +744,8 @@ const OrderConfirm = () => {
 
       // 分别加载数据，避免类型推断问题
       let goodsRes: ShopGoods | null = null
-      if (goodsId) {
+      if (resolvedGoodsId) {
-        goodsRes = await getShopGoods(Number(goodsId))
+        goodsRes = await getShopGoods(resolvedGoodsId)
       }
 
       const [addressRes, paymentRes] = await Promise.all([
@@ -694,9 +756,9 @@ const OrderConfirm = () => {
       // 设置商品信息
       // 查询当前商品是否存在水票套票活动（失败/无数据时不影响正常下单）
       let tpl: GltTicketTemplate | null = null
-      if (goodsId) {
+      if (resolvedGoodsId) {
         try {
-          tpl = await getGltTicketTemplateByGoodsId(Number(goodsId))
+          tpl = await getGltTicketTemplateByGoodsId(resolvedGoodsId)
         } catch (e) {
           tpl = null
         }
@@ -712,18 +774,41 @@ const OrderConfirm = () => {
         const n = Number(tpl?.minBuyQty)
         return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1
       })()
+      const tplStep = (() => {
+        const n = Number(tpl?.step)
+        return Number.isFinite(n) && n > 0 ? Math.floor(n) : undefined
+      })()
 
       // 设置商品信息（若存在套票模板，则默认 canBuyNumber 使用模板最小购买量）
       if (goodsRes) {
         const patchedGoods: ShopGoods = { ...goodsRes }
+        // 兜底：确保 step 为合法正整数；若存在套票模板则优先使用模板 step
+        const goodsStepNum = Number((patchedGoods as any)?.step)
+        const goodsStep = Number.isFinite(goodsStepNum) && goodsStepNum > 0 ? Math.floor(goodsStepNum) : 1
+        patchedGoods.step = tplActive && tplStep ? tplStep : goodsStep
+
+        // 规格商品（orderData 模式）下单时，用 sku 价格覆盖展示与计算金额
+        if (orderDataParam?.price !== undefined && orderDataParam?.price !== null && orderDataParam?.price !== '') {
+          patchedGoods.price = String(orderDataParam.price)
+        }
+
         if (tplActive && ((patchedGoods.canBuyNumber ?? 0) === 0)) {
           patchedGoods.canBuyNumber = tplMinBuyQty
         }
         setGoods(patchedGoods)
 
-        // 设置默认购买数量：优先使用 canBuyNumber，否则使用 1
+        // 设置默认购买数量：优先使用 canBuyNumber，其次使用路由参数 quantity，否则使用 1
-        const initQty = (patchedGoods.canBuyNumber ?? 0) > 0 ? (patchedGoods.canBuyNumber as number) : 1
+        const fixedQty = (patchedGoods.canBuyNumber ?? 0) > 0 ? Number(patchedGoods.canBuyNumber) : undefined
-        setQuantity(initQty)
+        const rawQty = fixedQty ?? quantityFromParam ?? 1
+        const minQty = tplActive ? tplMinBuyQty : 1
+        const step = patchedGoods.step || 1
+        const stockMax = patchedGoods.stock ?? 999
+        const maxMultiple = step > 1 ? Math.floor(stockMax / step) * step : stockMax
+        const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+        const effectiveMin = Math.min(minQty, maxAllowed)
+        const clamped = Math.max(effectiveMin, Math.min(Math.floor(rawQty), maxAllowed))
+        const stepped = step > 1 ? Math.ceil(clamped / step) * step : clamped
+        setQuantity(Math.min(maxAllowed, Math.max(effectiveMin, stepped)))
       }
 
       setTicketTemplate(tpl)
@@ -748,9 +833,20 @@ const OrderConfirm = () => {
           const n = Number(goodsRes?.canBuyNumber)
           if (Number.isFinite(n) && n > 0) return Math.floor(n)
           if (tplActive) return tplMinBuyQty
-          return 1
+          return quantityFromParam || 1
         })()
-        const total = parseFloat(goodsRes.price || '0') * initQty
+        const stepForInit = tplActive && tplStep ? tplStep : (() => {
+          const n = Number((goodsRes as any)?.step)
+          return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1
+        })()
+        const stockMax = goodsRes.stock ?? 999
+        const maxMultiple = stepForInit > 1 ? Math.floor(stockMax / stepForInit) * stepForInit : stockMax
+        const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+        const initQtySnapped = stepForInit > 1 ? Math.ceil(initQty / stepForInit) * stepForInit : initQty
+        const effectiveMin = Math.min(tplActive ? tplMinBuyQty : 1, maxAllowed)
+        const safeInitQty = Math.max(effectiveMin, Math.min(initQtySnapped, maxAllowed))
+        const unitPrice = parseFloat(String(orderDataParam?.price ?? goodsRes.price ?? '0'))
+        const total = unitPrice * safeInitQty
         await loadUserCoupons(total)
       }
     } catch (err) {
@@ -771,7 +867,7 @@ const OrderConfirm = () => {
   useEffect(() => {
     if (!isLoggedIn()) return
     loadAllData()
-  }, [goodsId]);
+  }, [resolvedGoodsId, orderDataRaw]);
 
   // 重新加载数据
   const handleRetry = () => {
@@ -868,7 +964,7 @@ const OrderConfirm = () => {
 	                      value={quantity}
 	                      min={isTicketTemplateActive ? minBuyQty : 1}
 	                      max={goods.stock || 999}
-	                      step={minBuyQty === 1 ? 1 : 10}
+	                      step={goods.step || 1}
 	                      readOnly
                         disabled={((goods.canBuyNumber ?? 0) !== 0) && !isTicketTemplateActive}
 	                      onChange={handleQuantityChange}

src/user/ticket/index.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useRef, useState } from 'react';
 import Taro, { useDidShow } from '@tarojs/taro';
 import {
   Button,
@@ -23,6 +23,7 @@ import dayjs from "dayjs";
 import { ensureLoggedIn } from '@/utils/auth';
 
 const PAGE_SIZE = 10;
+const PAY_REFRESH_HANDLED_KEY = 'user_ticket_from_pay_at_handled';
 
 const UserTicketList = () => {
   const [ticketList, setTicketList] = useState<GltUserTicket[]>([]);
@@ -37,6 +38,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
@@ -46,6 +48,25 @@ const UserTicketList = () => {
   const [qrVisible, setQrVisible] = useState(false);
   const [qrTicket, setQrTicket] = useState<GltUserTicket | null>(null);
   const [qrImageUrl, setQrImageUrl] = useState('');
+  const payAutoRefreshRunningRef = useRef(false);
+
+  const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+  const parsePositiveNumberParam = (v: unknown) => {
+    const n = Number(v);
+    return Number.isFinite(n) && n > 0 ? n : undefined;
+  };
+
+  const getFromPayAtParam = () => {
+    const params = Taro.getCurrentInstance().router?.params;
+    return parsePositiveNumberParam((params as any)?.fromPayAt);
+  };
+
+  const shouldAutoRefreshAfterPay = (fromPayAt?: number) => {
+    if (!fromPayAt) return false;
+    const handled = parsePositiveNumberParam(Taro.getStorageSync(PAY_REFRESH_HANDLED_KEY)) || 0;
+    return handled !== fromPayAt;
+  };
 
   const getUserId = () => {
     const raw = Taro.getStorageSync('UserId');
@@ -320,40 +341,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 +457,7 @@ const UserTicketList = () => {
       Taro.showToast({ title: '仅配送未开始的订单可取消', icon: 'none' });
       return;
     }
+    if (orderCancelLoadingById[order.id]) return;
 
     const modal = await Taro.showModal({
       title: '取消订单',
@@ -400,6 +467,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) {
@@ -412,7 +480,7 @@ const UserTicketList = () => {
       }
       try {
         await rollbackUserTicketAfterOrderCancel(order, beforeTicket);
-        Taro.showToast({ title: '订单已取消，水票已退回', icon: 'success' });
+        Taro.showToast({ title: '订单已取消，水票已退回', icon: 'none' });
       } catch (e) {
         console.error('取消订单后退回水票失败:', e);
         await Taro.showModal({
@@ -427,6 +495,7 @@ const UserTicketList = () => {
       Taro.showToast({ title: '取消失败，请重试', icon: 'none' });
     } finally {
       Taro.hideLoading();
+      setOrderCancelLoadingById((prev) => ({ ...prev, [order.id as number]: false }));
     }
   };
 
@@ -481,22 +550,36 @@ const UserTicketList = () => {
   }
 
   useDidShow(() => {
-    const tabParam = Taro.getCurrentInstance().router?.params?.tab
+    void (async () => {
-    const nextTab =
+      const tabParam = Taro.getCurrentInstance().router?.params?.tab;
-      tabParam === 'ticket' || tabParam === 'order'
+      const nextTab = tabParam === 'ticket' || tabParam === 'order' ? tabParam : undefined;
-        ? tabParam
-        : undefined
 
       if (nextTab && nextTab !== activeTab) {
-      setActiveTab(nextTab)
+        setActiveTab(nextTab);
       }
 
-    const tabToLoad = nextTab || activeTab
+      const tabToLoad = nextTab || activeTab;
       if (tabToLoad === 'ticket') {
-      reloadTickets(true).then()
+        await reloadTickets(true);
-    } else {
+
-      reloadOrders(true).then()
+        const fromPayAt = getFromPayAtParam();
+        if (shouldAutoRefreshAfterPay(fromPayAt) && !payAutoRefreshRunningRef.current) {
+          payAutoRefreshRunningRef.current = true;
+          try {
+            Taro.setStorageSync(PAY_REFRESH_HANDLED_KEY, fromPayAt);
+            // 支付后水票可能异步入账：自动再刷新几次，避免用户手动下拉刷新。
+            for (const delayMs of [800, 1500, 2500]) {
+              await sleep(delayMs);
+              await reloadTickets(true);
             }
+          } finally {
+            payAutoRefreshRunningRef.current = false;
+          }
+        }
+      } else {
+        await reloadOrders(true);
+      }
+    })();
   })
 
   return (
@@ -699,31 +782,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 +818,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);
@@ -77,6 +75,8 @@ const OrderConfirm = () => {
   const [ticketLoading, setTicketLoading] = useState(false)
   const [ticketLoaded, setTicketLoaded] = useState(false)
   const noTicketPromptedRef = useRef(false)
+  const ticketAutoRetryCountRef = useRef(0)
+  const ticketAutoRetryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
   // Delivery range (geofence): block ordering if address/current location is outside.
   const [fences, setFences] = useState<ShopStoreFence[]>([])
@@ -112,18 +112,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 +130,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) => {
@@ -316,6 +209,39 @@ const OrderConfirm = () => {
     return !!userId && ticketLoaded && !ticketLoading && usableTickets.length === 0
   }, [ticketLoaded, ticketLoading, usableTickets.length, userId])
 
+  // After buying tickets and redirecting here, some backends may issue tickets asynchronously.
+  // If opened with a `goodsId`, retry a few times to refresh tickets.
+  useEffect(() => {
+    if (isEditMode) return
+    if (!numericGoodsId) return
+    if (!ticketLoaded || ticketLoading) return
+
+    if (usableTickets.length > 0) {
+      ticketAutoRetryCountRef.current = 0
+      return
+    }
+
+    if (ticketAutoRetryCountRef.current >= 4) return
+    if (ticketAutoRetryTimerRef.current) return
+
+    const delays = [800, 1500, 2500, 4000]
+    const delay = delays[ticketAutoRetryCountRef.current] ?? 2500
+    ticketAutoRetryCountRef.current += 1
+    ticketAutoRetryTimerRef.current = setTimeout(async () => {
+      ticketAutoRetryTimerRef.current = null
+      await loadUserTickets()
+    }, delay)
+  }, [isEditMode, numericGoodsId, ticketLoaded, ticketLoading, usableTickets.length])
+
+  useEffect(() => {
+    return () => {
+      if (ticketAutoRetryTimerRef.current) {
+        clearTimeout(ticketAutoRetryTimerRef.current)
+        ticketAutoRetryTimerRef.current = null
+      }
+    }
+  }, [])
+
   const maxQuantity = useMemo(() => {
     const stockMax = goods?.stock ?? 999
     if (!isEditMode) return Math.max(0, Math.min(stockMax, availableTicketTotal))
@@ -363,18 +289,16 @@ 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)
-
-    if (!limit.canModify) {
-      Taro.showToast({
-        title: `送水地址每${ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次${limit.nextAllowedText ? '，' + limit.nextAllowedText + ' 后可修改' : ''}`,
-        icon: 'none',
-      })
         return
       }
+      if (!isPendingDeliveryOrder(editingOrder)) {
+        Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
+        return
+      }
+    }
     Taro.navigateTo({ url: '/user/address/index' })
   }
 
@@ -662,27 +586,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 +770,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 +801,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) {
@@ -930,6 +819,11 @@ const OrderConfirm = () => {
   useDidShow(() => {
     // 返回/切换到该页面时，刷新一下当前已选门店
     setSelectedStore(getSelectedStoreFromStorage())
+    ticketAutoRetryCountRef.current = 0
+    if (ticketAutoRetryTimerRef.current) {
+      clearTimeout(ticketAutoRetryTimerRef.current)
+      ticketAutoRetryTimerRef.current = null
+    }
     loadAllData({ silent: hasInitialLoadedRef.current })
   })
 
@@ -989,10 +883,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 +894,7 @@ const OrderConfirm = () => {
     address?.id,
     addressHasCoords,
     deliveryRangeCheckedAddressId,
-    inDeliveryRange,
+    inDeliveryRange
-    ticketAddressModifyLimit.loaded,
-    ticketAddressModifyLimit.canModify
   ])
 
   // When tickets/stock change, clamp quantity into [0..maxQuantity].
@@ -1065,22 +953,24 @@ const OrderConfirm = () => {
   // If user has no usable tickets, proactively guide them to purchase (only once per page lifecycle).
   useEffect(() => {
     if (!noUsableTickets) return
+    // Editing an existing order: don't interrupt with "no tickets" prompt.
+    if (isEditMode) return
     if (noTicketPromptedRef.current) return
     noTicketPromptedRef.current = true
 
-    ;(async () => {
+    // ;(async () => {
-      const r = await Taro.showModal({
+    //   const r = await Taro.showModal({
-        title: '暂无可用水票',
+    //     title: '暂无可用水票',
-        content: '您当前没有可用水票，购买后再来下单更方便。',
+    //     content: '您当前没有可用水票，购买后再来下单更方便。',
-        confirmText: '去购买',
+    //     confirmText: '去购买',
-        cancelText: '暂不'
+    //     cancelText: '暂不'
-      })
+    //   })
-      if (r.confirm) {
+    //   if (r.confirm) {
-        await goBuyTickets()
+    //     await goBuyTickets()
-      }
+    //   }
-    })()
+    // })()
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [noUsableTickets])
+  }, [noUsableTickets, isEditMode])
 
   // 重新加载数据
   const handleRetry = () => {
@@ -1145,12 +1035,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>
@@ -1252,7 +1136,7 @@ const OrderConfirm = () => {
 	                await loadUserTickets()
 	                return
 	              }
-	              if (noUsableTickets) {
+	              if (noUsableTickets && !isEditMode) {
 	                const r = await Taro.showModal({
 	                  title: '暂无可用水票',
 	                  content: '您还没有可用水票，是否前往购买？',
@@ -1265,7 +1149,7 @@ const OrderConfirm = () => {
 	              setTicketPopupVisible(true)
 	            }}
 	        />
-          {noUsableTickets && (
+          {(noUsableTickets && !isEditMode) && (
             <Cell
               title={<Text className="text-gray-500">还没有购买水票</Text>}
               description="购买水票后即可在这里直接下单送水"
@@ -1341,8 +1225,11 @@ const OrderConfirm = () => {
                 <View className="py-10 text-center">
                   <Empty description="暂无可用水票" />
                   <View className="mt-4 flex justify-center">
-                    <Button type="primary" onClick={goBuyTickets}>
+                    <Button
-                      去购买水票
+                      type="primary"
+                      onClick={isEditMode ? () => setTicketPopupVisible(false) : goBuyTickets}
+                    >
+                      {isEditMode ? '确定修改' : '确定下单'}
                     </Button>
                   </View>
                 </View>
@@ -1424,9 +1311,9 @@ const OrderConfirm = () => {
             </View>
 	          </div>
 	          <div className={'buy-btn mx-4'}>
-              {noUsableTickets ? (
+	              {noUsableTickets && !isEditMode ? (
 	                <Button type="primary" size="large" onClick={goBuyTickets}>
-                  去购买水票
+	                  {isEditMode ? '确定修改' : '确定下单'}
 	                </Button>
 	              ) : (
 		                <Button
@@ -1438,7 +1325,7 @@ const OrderConfirm = () => {
                       !address?.id ||
                       !addressHasCoords ||
 		                    (deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
-	                    availableTicketTotal <= 0 ||
+		                    (!isEditMode && availableTicketTotal <= 0) ||
 		                    !canStartOrder
 		                  }
 		                  onClick={onSubmit}
@@ -1451,7 +1338,7 @@ const OrderConfirm = () => {
                         ? '地址缺少定位'
                         : ((deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false)
                           ? '不在配送范围'
-                          : (submitLoading ? '提交中...' : '立即提交')
+		                          : (submitLoading ? '提交中...' : (isEditMode ? '确定修改' : '立即提交'))
 		                        )
 		                      )
 		                    )