refactor(order): 重构订单状态处理逻辑并优化送水订单功能

- 将订单状态相关工具函数提取到独立的 utils 文件中
- 统一订单状态文本和颜色显示逻辑
- 移除重复的状态判断函数
- 优化送水订单列表的数据过滤逻辑
- 添加订单编辑模式支持
- 实现订单修改和取消功能
- 修复订单状态判断中的数值转换问题
- 优化送水订单的时间选择组件
- 添加订单数据加载和验证逻辑
- 重构订单详情页的条件渲染逻辑

src/dealer/withdraw/index.tsx

@@ -491,7 +491,7 @@ const DealerWithdraw: React.FC = () => {
           <Form.Item name="amount" label="提现金额">
             <Input
               placeholder="请输入提现金额"
-              type="number"
+              type="digit"
             />
           </Form.Item>
 

src/shop/orderConfirm/index.tsx

@@ -1,4 +1,4 @@
-import {useEffect, useMemo, useState} from "react";
+import {useEffect, useState} from "react";
 import {
   Image,
   Button,
@@ -9,7 +9,6 @@ import {
   ActionSheet,
   Popup,
   InputNumber,
-  DatePicker,
   ConfigProvider
 } from '@nutui/nutui-react-taro'
 import {Location, ArrowRight} from '@nutui/icons-react-taro'
@@ -39,7 +38,6 @@ import {
   filterUsableCoupons,
   filterUnusableCoupons
 } from "@/utils/couponUtils";
-import dayjs from 'dayjs'
 import type {ShopStore} from "@/api/shop/shopStore/model";
 import {getShopStore, listShopStore} from "@/api/shop/shopStore";
 import {getSelectedStoreFromStorage, saveSelectedStoreToStorage} from "@/utils/storeSelection";
@@ -57,18 +55,6 @@ const OrderConfirm = () => {
   const [loading, setLoading] = useState<boolean>(true)
   const [error, setError] = useState<string>('')
   const [payLoading, setPayLoading] = useState<boolean>(false)
-  // 配送时间（仅水票套票商品需要）
-  // 当日截单时间：超过该时间下单，最早配送日顺延到次日（避免 21:00 下单仍显示“当天配送”）
-  const DELIVERY_CUTOFF_HOUR = 21
-  const getMinSendDate = () => {
-    const now = dayjs()
-    const cutoff = now.hour(DELIVERY_CUTOFF_HOUR).minute(0).second(0).millisecond(0)
-    const startOfToday = now.startOf('day')
-    // >= 截单时间则最早只能选次日
-    return now.isSame(cutoff) || now.isAfter(cutoff) ? startOfToday.add(1, 'day') : startOfToday
-  }
-  const [sendTime, setSendTime] = useState<Date>(() => getMinSendDate().toDate())
-  const [sendTimePickerVisible, setSendTimePickerVisible] = useState(false)
 
   // 水票套票活动（若存在则按规则限制最小购买量等）
   const [ticketTemplate, setTicketTemplate] = useState<GltTicketTemplate | null>(null)
@@ -122,10 +108,6 @@ const OrderConfirm = () => {
   })()
   const minBuyQty = isTicketTemplateActive ? ticketMinBuyQty : 1
 
-  const sendTimeText = useMemo(() => {
-    return dayjs(sendTime).format('YYYY-MM-DD')
-  }, [sendTime])
-
   const getGiftTicketQty = (buyQty: number) => {
     if (!isTicketTemplateActive) return 0
     const multiplier = Number(ticketTemplate?.giftMultiplier || 0)
@@ -451,22 +433,7 @@ const OrderConfirm = () => {
         return;
       }
 
-      // 水票套票商品：保存配送时间到 ShopOrder.sendStartTime
+      // 购买水票（囤券预付费）与水票核销（下单履约）为两个独立动作：下单页不再选择配送时间。
-      if (hasTicketTemplate && !sendTime) {
-        Taro.showToast({ title: '请选择配送时间', icon: 'none' })
-        return
-      }
-      if (hasTicketTemplate) {
-        const min = getMinSendDate()
-        if (dayjs(sendTime).isBefore(min, 'day')) {
-          setSendTime(min.toDate())
-          Taro.showToast({
-            title: `已过当日${DELIVERY_CUTOFF_HOUR}点截单，最早配送：${min.format('YYYY-MM-DD')}`,
-            icon: 'none'
-          })
-          return
-        }
-      }
 
       // 水票套票活动：最小购买量校验
       if (isTicketTemplateActive && quantity < minBuyQty) {
@@ -530,9 +497,6 @@ const OrderConfirm = () => {
                   comments: goods.name,
                   deliveryType: 0,
                   buyerRemarks: orderRemark,
-                  sendStartTime: hasTicketTemplate
-                    ? dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
-                    : undefined,
                   couponId: parseInt(String(bestCoupon.id), 10)
                 }
               );
@@ -540,7 +504,31 @@ const OrderConfirm = () => {
               console.log('🎯 使用推荐优惠券的订单数据:', updatedOrderData);
 
               // 执行支付
-              await PaymentHandler.pay(updatedOrderData, currentPaymentType);
+              await PaymentHandler.pay(updatedOrderData, currentPaymentType, hasTicketTemplate ? {
+                onSuccess: async () => {
+                  const id = goods.goodsId
+                  try {
+                    const res = await Taro.showModal({
+                      title: '提示',
+                      content: '是否立刻送水？',
+                      confirmText: '立刻送水',
+                      cancelText: '稍后'
+                    })
+                    if (res?.confirm) {
+                      if (id) {
+                        await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
+                      } else {
+                        await Taro.redirectTo({ url: '/user/ticket/index' })
+                      }
+                    } else {
+                      await Taro.redirectTo({ url: '/user/ticket/index' })
+                    }
+                  } catch (_e) {
+                    await Taro.redirectTo({ url: '/user/ticket/index' })
+                  }
+                  return false
+                }
+              } : undefined);
               return; // 提前返回，避免重复执行支付
             } else {
               // 用户选择不使用优惠券，继续支付
@@ -558,9 +546,6 @@ const OrderConfirm = () => {
           comments: '桂乐淘',
           deliveryType: 0,
           buyerRemarks: orderRemark,
-          sendStartTime: hasTicketTemplate
-            ? dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
-            : undefined,
           // 🔧 确保 couponId 是正确的数字类型，且不传递 undefined
           couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined
         }
@@ -595,7 +580,31 @@ const OrderConfirm = () => {
       });
 
       // 执行支付 - 移除这里的成功提示，让PaymentHandler统一处理
-      await PaymentHandler.pay(orderData, paymentType);
+      await PaymentHandler.pay(orderData, paymentType, hasTicketTemplate ? {
+        onSuccess: async () => {
+          const id = goods.goodsId
+          try {
+            const res = await Taro.showModal({
+              title: '提示',
+              content: '是否立刻送水？',
+              confirmText: '立刻送水',
+              cancelText: '稍后'
+            })
+            if (res?.confirm) {
+              if (id) {
+                await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
+              } else {
+                await Taro.redirectTo({ url: '/user/ticket/index' })
+              }
+            } else {
+              await Taro.redirectTo({ url: '/user/ticket/index' })
+            }
+          } catch (_e) {
+            await Taro.redirectTo({ url: '/user/ticket/index' })
+          }
+          return false
+        }
+      } : undefined);
 
       // ✅ 移除双重成功提示 - PaymentHandler会处理成功提示
       // Taro.showToast({
@@ -760,10 +769,7 @@ const OrderConfirm = () => {
   })
 
   useEffect(() => {
-    // 切换商品时重置配送时间，避免沿用上一次选择
     if (!isLoggedIn()) return
-    setSendTime(getMinSendDate().toDate())
-    setSendTimePickerVisible(false)
     loadAllData()
   }, [goodsId]);
 
@@ -822,28 +828,6 @@ const OrderConfirm = () => {
         )}
       </CellGroup>
 
-      {hasTicketTemplate && (
-        <CellGroup>
-          <Cell
-            title={'配送时间'}
-            extra={(
-              <View className={'flex items-center gap-2'}>
-                <View className={'text-gray-900'}>{sendTimeText}</View>
-                <ArrowRight className={'text-gray-400'} size={14}/>
-              </View>
-            )}
-            onClick={() => {
-              // 若页面停留跨过截单时间，打开选择器前再校正一次最早可选日期
-              const min = getMinSendDate()
-              if (dayjs(sendTime).isBefore(min, 'day')) {
-                setSendTime(min.toDate())
-              }
-              setSendTimePickerVisible(true)
-            }}
-          />
-        </CellGroup>
-      )}
-
       {/*<CellGroup>*/}
       {/*  <Cell*/}
       {/*    title={(*/}
@@ -1138,23 +1122,6 @@ const OrderConfirm = () => {
 
       <Gap height={50}/>
 
-      <DatePicker
-        visible={sendTimePickerVisible}
-        title="选择配送时间"
-        type="date"
-        startDate={getMinSendDate().toDate()}
-        endDate={dayjs().add(30, 'day').toDate()}
-        value={sendTime}
-        onClose={() => setSendTimePickerVisible(false)}
-        onCancel={() => setSendTimePickerVisible(false)}
-        onConfirm={(_options, selectedValue) => {
-          const [y, m, d] = (selectedValue || []).map(v => Number(v))
-          const next = new Date(y, (m || 1) - 1, d || 1, 0, 0, 0)
-          setSendTime(next)
-          setSendTimePickerVisible(false)
-        }}
-      />
-
       <div className={'fixed z-50 bg-white w-full bottom-0 left-0 pt-4 pb-10 border-t border-gray-200'}>
         <View className={'btn-bar flex justify-between items-center'}>
           <div className={'flex flex-col justify-center items-start mx-4'}>

src/shop/orderDetail/index.tsx

@@ -8,6 +8,7 @@ import {listShopOrderGoods} from "@/api/shop/shopOrderGoods";
 import {ShopOrderGoods} from "@/api/shop/shopOrderGoods/model";
 import dayjs from "dayjs";
 import PaymentCountdown from "@/components/PaymentCountdown";
+import {getShopOrderStatusText} from "@/utils/shopOrderStatus";
 import './index.scss'
 
 // 申请退款：支付成功后仅允许在指定时间窗内发起（前端展示层限制，后端仍应校验）
@@ -114,37 +115,6 @@ const OrderDetail = () => {
     }
   }
 
-  const getOrderStatusText = (order: ShopOrder) => {
-    // 优先检查订单状态
-    if (order.orderStatus === 2) return '已取消';
-    if (order.orderStatus === 3) return '取消中';
-    if (order.orderStatus === 4) return '退款申请中';
-    if (order.orderStatus === 5) return '退款被拒绝';
-    if (order.orderStatus === 6) return '退款成功';
-    if (order.orderStatus === 7) return '客户端申请退款';
-
-    // 检查支付状态 (payStatus为boolean类型)
-    if (!order.payStatus) return '待付款';
-
-    // 已付款后检查发货状态
-    if (order.deliveryStatus === 10) return '待发货';
-    if (order.deliveryStatus === 20) {
-      // 若订单有配送员，则以配送员送达时间作为“可确认收货”的依据
-      if (order.riderId) {
-        if (order.sendEndTime && order.orderStatus !== 1) return '待确认收货';
-        return '配送中';
-      }
-      return '待收货';
-    }
-    if (order.deliveryStatus === 30) return '部分发货';
-
-    // 最后检查订单完成状态
-    if (order.orderStatus === 1) return '已完成';
-    if (order.orderStatus === 0) return '未使用';
-
-    return '未知状态';
-  };
-
   const getPayTypeText = (payType?: number) => {
     switch (payType) {
       case 0:
@@ -194,7 +164,7 @@ const OrderDetail = () => {
     order.payStatus &&
     order.orderStatus !== 1 &&
     order.deliveryStatus === 20 &&
-    (!order.riderId || !!order.sendEndTime)
+    (!order.riderId || Number(order.riderId) === 0 || !!order.sendEndTime)
 
   return (
     <div className={'order-detail-page'}>
@@ -232,7 +202,7 @@ const OrderDetail = () => {
       <CellGroup>
         <Cell title="订单编号" description={order.orderNo}/>
         <Cell title="下单时间" description={dayjs(order.createTime).format('YYYY-MM-DD HH:mm:ss')}/>
-        <Cell title="订单状态" description={getOrderStatusText(order)}/>
+        <Cell title="订单状态" description={getShopOrderStatusText(order)}/>
       </CellGroup>
 
       <CellGroup>

src/user/order/components/OrderList.tsx

@@ -16,6 +16,7 @@ import {copyText} from "@/utils/common";
 import PaymentCountdown from "@/components/PaymentCountdown";
 import {PaymentType} from "@/utils/payment";
 import {ErrorType, RequestError} from "@/utils/request";
+import {getShopOrderStatusColor, getShopOrderStatusText, isShopOrderCompleted} from "@/utils/shopOrderStatus";
 
 // 判断订单是否支付已过期
 const isPaymentExpired = (createTime: string, timeoutHours: number = 24): boolean => {
@@ -165,68 +166,11 @@ function OrderList(props: OrderListProps) {
   };
 
   // “已完成”应以订单状态为准；不要用商品ID等字段推断完成态，否则会造成 Tab(待发货/待收货) 与状态文案不同步
-  const isOrderCompleted = (order: ShopOrder) => toNum(order.orderStatus) === 1;
+  const isOrderCompleted = (order: ShopOrder) => isShopOrderCompleted(order);
 
-  // 获取订单状态文本
+  const getOrderStatusText = (order: ShopOrder) => getShopOrderStatusText(order);
-  const getOrderStatusText = (order: ShopOrder) => {
-    const orderStatus = toNum(order.orderStatus);
-    const deliveryStatus = toNum(order.deliveryStatus);
 
-    // 优先检查订单状态
+  const getOrderStatusColor = (order: ShopOrder) => getShopOrderStatusColor(order);
-    if (orderStatus === 2) return '已取消';
-    if (orderStatus === 4) return '退款申请中';
-    if (orderStatus === 5) return '退款被拒绝';
-    if (orderStatus === 6) return '退款成功';
-    if (orderStatus === 7) return '客户端申请退款';
-    if (isOrderCompleted(order)) return '已完成';
-
-    // 检查支付状态 (payStatus为boolean类型，false/0表示未付款，true/1表示已付款)
-    if (!order.payStatus) return '等待买家付款';
-
-    // 已付款后检查发货状态
-    if (deliveryStatus === 10) return '待发货';
-    if (deliveryStatus === 20) {
-      // 若订单没有配送员，沿用原“待收货”语义
-      if (!order.riderId || Number(order.riderId) === 0) return '待收货';
-      // 配送员确认送达后（sendEndTime有值），才进入“待确认收货”
-      if (order.sendEndTime && !isOrderCompleted(order)) return '待确认收货';
-      return '配送中';
-    }
-    if (deliveryStatus === 30) return '部分发货';
-
-    if (orderStatus === 0) return '未使用';
-
-    return '未知状态';
-  };
-
-  // 获取订单状态颜色
-  const getOrderStatusColor = (order: ShopOrder) => {
-    const orderStatus = toNum(order.orderStatus);
-    const deliveryStatus = toNum(order.deliveryStatus);
-    // 优先检查订单状态
-    if (orderStatus === 2) return 'text-gray-500'; // 已取消
-    if (orderStatus === 4) return 'text-orange-500'; // 退款申请中
-    if (orderStatus === 5) return 'text-red-500'; // 退款被拒绝
-    if (orderStatus === 6) return 'text-green-500'; // 退款成功
-    if (orderStatus === 7) return 'text-orange-500'; // 客户端申请退款
-    if (isOrderCompleted(order)) return 'text-green-600'; // 已完成
-
-    // 检查支付状态
-    if (!order.payStatus) return 'text-orange-500'; // 等待买家付款
-
-    // 已付款后检查发货状态
-    if (deliveryStatus === 10) return 'text-blue-500'; // 待发货
-    if (deliveryStatus === 20) {
-      if (!order.riderId || Number(order.riderId) === 0) return 'text-purple-500'; // 待收货
-      if (order.sendEndTime && !isOrderCompleted(order)) return 'text-purple-500'; // 待确认收货
-      return 'text-blue-500'; // 配送中
-    }
-    if (deliveryStatus === 30) return 'text-blue-500'; // 部分发货
-
-    if (orderStatus === 0) return 'text-gray-500'; // 未使用
-
-    return 'text-gray-600'; // 默认颜色
-  };
 
   // 使用后端统一的 statusFilter 进行筛选
   const getOrderStatusParams = (index: string | number) => {

src/user/ticket/index.tsx

@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 import Taro, { useDidShow } from '@tarojs/taro';
 import {
   Button,
@@ -16,9 +16,8 @@ import {
 import { View, Text, Image } from '@tarojs/components';
 import { pageGltUserTicket } from '@/api/glt/gltUserTicket';
 import type { GltUserTicket } from '@/api/glt/gltUserTicket/model';
-import { pageGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder';
+import { pageGltTicketOrder, removeGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder';
 import type { GltTicketOrder } from '@/api/glt/gltTicketOrder/model';
-import { getShopUserAddress } from '@/api/shop/shopUserAddress';
 import { BaseUrl } from '@/config/app';
 import dayjs from "dayjs";
 
@@ -47,8 +46,6 @@ const UserTicketList = () => {
   const [qrTicket, setQrTicket] = useState<GltUserTicket | null>(null);
   const [qrImageUrl, setQrImageUrl] = useState('');
 
-  const addressCacheRef = useRef<Record<number, { lng: number; lat: number; fullAddress?: string } | null>>({});
-
   const getUserId = () => {
     const raw = Taro.getStorageSync('UserId');
     const id = Number(raw);
@@ -188,17 +185,16 @@ const UserTicketList = () => {
       });
 
       const resList = res?.list || [];
-      const nextList = isRefresh ? resList : [...orderList, ...resList];
+      const safeList = resList.filter((o) => Number((o as any)?.deleted) !== 1);
+      const nextList = isRefresh ? safeList : [...orderList, ...safeList];
       setOrderList(nextList);
-      const count = typeof res?.count === 'number' ? res.count : nextList.length;
+      const serverCount = typeof res?.count === 'number' ? res.count : undefined;
-      setOrderTotal(count);
+      const total = typeof serverCount === 'number' ? serverCount : nextList.length;
-      setOrderHasMore(nextList.length < count);
+      setOrderTotal(total);
+      setOrderHasMore(typeof serverCount === 'number' ? nextList.length < serverCount : resList.length >= PAGE_SIZE);
 
-      if (resList.length > 0) {
+      if (resList.length > 0) setOrderPage(currentPage + 1);
-        setOrderPage(currentPage + 1);
+      else setOrderHasMore(false);
-      } else {
-        setOrderHasMore(false);
-      }
     } catch (error) {
       console.error('获取送水订单失败:', error);
       Taro.showToast({ title: '获取送水订单失败', icon: 'error' });
@@ -265,78 +261,60 @@ const UserTicketList = () => {
     return d.isValid() ? d.format('YYYY年MM月DD日') : v;
   };
 
-  const parseLatLng = (latRaw?: unknown, lngRaw?: unknown) => {
+  const isTicketOrderPendingDelivery = (order: GltTicketOrder) => {
-    const lat = typeof latRaw === 'number' ? latRaw : parseFloat(String(latRaw ?? ''));
+    if (!order?.id) return false;
-    const lng = typeof lngRaw === 'number' ? lngRaw : parseFloat(String(lngRaw ?? ''));
+    if (Number(order.status) === 1) return false;
-    if (!Number.isFinite(lat) || !Number.isFinite(lng)) return null;
+    if (Number((order as any)?.deleted) === 1) return false;
-    if (Math.abs(lat) > 90 || Math.abs(lng) > 180) return null;
+    if (order.receiveConfirmTime || order.sendEndTime || order.sendStartTime) return false;
-    return { lat, lng };
+
+    const ds = order.deliveryStatus;
+    if (typeof ds === 'number') return ds === 10;
+    return !!order.riderId;
   };
 
-  const handleNavigateToAddress = async (order: GltTicketOrder) => {
+  const handleOrderModify = async (order: GltTicketOrder) => {
-    try {
+    if (!order?.id) {
-      // Prefer coordinates from backend if present (non-typed fields), otherwise fetch by addressId.
+      Taro.showToast({ title: '订单信息不完整', icon: 'none' });
-      const anyOrder = order as any;
-      const direct =
-        parseLatLng(anyOrder?.addressLat ?? anyOrder?.lat, anyOrder?.addressLng ?? anyOrder?.lng) ||
-        parseLatLng(anyOrder?.receiverLat, anyOrder?.receiverLng);
-
-      let coords = direct;
-      let fullAddress: string | undefined = order.address || undefined;
-
-      if (!coords && order.addressId) {
-        const cached = addressCacheRef.current[order.addressId];
-        if (cached) {
-          coords = { lat: cached.lat, lng: cached.lng };
-          fullAddress = fullAddress || cached.fullAddress;
-        } else if (cached === null) {
-          coords = null;
-        } else {
-          const addr = await getShopUserAddress(order.addressId);
-          const parsed = parseLatLng(addr?.lat, addr?.lng);
-          if (parsed) {
-            coords = parsed;
-            fullAddress = fullAddress || addr?.fullAddress || addr?.address || undefined;
-            addressCacheRef.current[order.addressId] = { ...parsed, fullAddress };
-          } else {
-            addressCacheRef.current[order.addressId] = null;
-          }
-        }
-      }
-
-      if (!coords) {
-        if (fullAddress) {
-          await Taro.setClipboardData({ data: fullAddress });
-          Taro.showToast({ title: '未配置定位，地址已复制', icon: 'none' });
-        } else {
-          Taro.showToast({ title: '暂无可导航的地址', icon: 'none' });
-        }
-        return;
-      }
-
-      Taro.openLocation({
-        latitude: coords.lat,
-        longitude: coords.lng,
-        name: '收货地址',
-        address: fullAddress || ''
-      });
-    } catch (e) {
-      console.error('一键导航失败:', e);
-      Taro.showToast({ title: '导航失败，请重试', icon: 'none' });
-    }
-  };
-
-  const handleOneClickCall = async (order: GltTicketOrder) => {
-    const phone = (order.riderPhone || order.storePhone || '').trim();
-    if (!phone) {
-      Taro.showToast({ title: '暂无可呼叫的电话', icon: 'none' });
       return;
     }
+    if (!isTicketOrderPendingDelivery(order)) {
+      Taro.showToast({ title: '仅“待配送”订单可修改', icon: 'none' });
+      return;
+    }
+    Taro.navigateTo({ url: `/user/ticket/use?orderId=${order.id}` });
+  };
+
+  const handleOrderCancel = async (order: GltTicketOrder) => {
+    if (!order?.id) {
+      Taro.showToast({ title: '订单信息不完整', icon: 'none' });
+      return;
+    }
+    if (!isTicketOrderPendingDelivery(order)) {
+      Taro.showToast({ title: '仅“待配送”订单可取消', icon: 'none' });
+      return;
+    }
+
+    const modal = await Taro.showModal({
+      title: '取消订单',
+      content: '确定要取消该订单吗？取消后无法恢复。',
+      confirmText: '确认取消'
+    });
+    if (!modal.confirm) return;
+
     try {
-      await Taro.makePhoneCall({ phoneNumber: phone });
+      Taro.showLoading({ title: '取消中...' });
+      try {
+        await updateGltTicketOrder({ id: order.id, deleted: 1 });
+      } catch (e) {
+        await removeGltTicketOrder(order.id);
+      }
+      Taro.showToast({ title: '订单已取消', icon: 'success' });
+      await reloadOrders(true);
     } catch (e) {
-      console.error('一键呼叫失败:', e);
+      console.error('取消送水订单失败:', e);
-      Taro.showToast({ title: '呼叫失败，请手动拨打', icon: 'none' });
+      Taro.showToast({ title: '取消失败，请重试', icon: 'none' });
+    } finally {
+      Taro.hideLoading();
     }
   };
 
@@ -576,30 +554,29 @@ const UserTicketList = () => {
                     <View className="mt-1">
                       <Text className="text-xs text-gray-500">下单时间：{formatDateTime(item.createTime)}</Text>
                     </View>
-                    {(!!item.addressId || !!item.address || !!item.riderPhone || !!item.storePhone) ? (
+                    {item.id ? (
                       <View className="mt-3 flex justify-end gap-2">
-                        {(!!item.addressId || !!item.address) ? (
+                        <Button
-                          <Button
+                          size="small"
-                            size="small"
+                          disabled={!isTicketOrderPendingDelivery(item)}
-                            onClick={(e) => {
+                          onClick={(e) => {
-                              e.stopPropagation();
+                            e.stopPropagation();
-                              void handleNavigateToAddress(item);
+                            void handleOrderModify(item);
-                            }}
+                          }}
-                          >
+                        >
-                            一键导航
+                          订单修改
-                          </Button>
+                        </Button>
-                        ) : null}
+                        <Button
-                        {(!!item.riderPhone || !!item.storePhone) ? (
+                          size="small"
-                          <Button
+                          type="danger"
-                            size="small"
+                          disabled={!isTicketOrderPendingDelivery(item)}
-                            onClick={(e) => {
+                          onClick={(e) => {
-                              e.stopPropagation();
+                            e.stopPropagation();
-                              void handleOneClickCall(item);
+                            void handleOrderCancel(item);
-                            }}
+                          }}
-                          >
+                        >
-                            一键呼叫
+                          订单取消
-                          </Button>
+                        </Button>
-                        ) : null}
                       </View>
                     ) : null}
                     {/*{item.storeName ? (*/}

src/user/ticket/use.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View, Text, Picker } from '@tarojs/components'
 import {
   Button,
   Cell,
@@ -25,8 +25,8 @@ import type {ShopStore} from "@/api/shop/shopStore/model";
 import {getShopStore, listShopStore} from "@/api/shop/shopStore";
 import {getSelectedStoreFromStorage, saveSelectedStoreToStorage} from "@/utils/storeSelection";
 import type { GltUserTicket } from '@/api/glt/gltUserTicket/model'
-import { listGltUserTicket } from '@/api/glt/gltUserTicket'
+import { getGltUserTicket, listGltUserTicket } from '@/api/glt/gltUserTicket'
-import { addGltTicketOrder } from '@/api/glt/gltTicketOrder'
+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'
@@ -44,7 +44,7 @@ const OrderConfirm = () => {
   const [quantity, setQuantity] = useState<number>(MIN_START_QTY)
   const [orderRemark, setOrderRemark] = useState<string>('')
   // Delivery date only (no hour/min selection).
-  const [sendTime] = useState<Date>(() => dayjs().startOf('day').toDate())
+  const [sendTime, setSendTime] = useState<Date>(() => dayjs().startOf('day').toDate())
   const [loading, setLoading] = useState<boolean>(true)
   const [error, setError] = useState<string>('')
   const [submitLoading, setSubmitLoading] = useState<boolean>(false)
@@ -89,11 +89,21 @@ const OrderConfirm = () => {
 
   const router = Taro.getCurrentInstance().router;
   const goodsId = router?.params?.goodsId;
+  const orderId = router?.params?.orderId;
   const numericGoodsId = useMemo(() => {
     const n = goodsId ? Number(goodsId) : undefined
     return typeof n === 'number' && Number.isFinite(n) ? n : undefined
   }, [goodsId])
 
+  const numericOrderId = useMemo(() => {
+    const n = orderId ? Number(orderId) : undefined
+    return typeof n === 'number' && Number.isFinite(n) && n > 0 ? n : undefined
+  }, [orderId])
+
+  const isEditMode = !!numericOrderId
+  const [editingOrder, setEditingOrder] = useState<GltTicketOrder | null>(null)
+  const editingInitRef = useRef(false)
+
   const userId = useMemo(() => {
     const raw = Taro.getStorageSync('UserId')
     const id = Number(raw)
@@ -300,8 +310,19 @@ const OrderConfirm = () => {
 
   const maxQuantity = useMemo(() => {
     const stockMax = goods?.stock ?? 999
-    return Math.max(0, Math.min(stockMax, availableTicketTotal))
+    if (!isEditMode) return Math.max(0, Math.min(stockMax, availableTicketTotal))
-  }, [availableTicketTotal, goods?.stock])
+
+    const original = Number(editingOrder?.totalNum ?? 0)
+    const originalSafe = Number.isFinite(original) ? original : 0
+    const ticketId = Number(editingOrder?.userTicketId ?? 0)
+    const ticketIdSafe = Number.isFinite(ticketId) && ticketId > 0 ? ticketId : undefined
+    const rawTicket = ticketIdSafe ? (tickets || []).find(t => Number(t?.id) === ticketIdSafe) : undefined
+    if (!rawTicket) return Math.max(0, Math.min(stockMax, originalSafe))
+
+    const avail = getTicketAvailableQty(rawTicket)
+    const upper = Math.max(0, avail + originalSafe)
+    return Math.max(0, Math.min(stockMax, upper))
+  }, [availableTicketTotal, editingOrder?.totalNum, editingOrder?.userTicketId, goods?.stock, isEditMode, tickets])
 
   const canStartOrder = useMemo(() => {
     return maxQuantity >= MIN_START_QTY
@@ -623,13 +644,16 @@ const OrderConfirm = () => {
   const onSubmit = async () => {
     if (submitLoading) return
     if (deliveryRangeCheckingRef.current) return
-    if (!goods?.goodsId) return
 
     // 基础校验
     if (!userId) {
       Taro.showToast({ title: '请先登录', icon: 'none' })
       return
     }
+    if (isEditMode && !editingOrder?.id) {
+      Taro.showToast({ title: '订单信息加载中，请稍后重试', icon: 'none' })
+      return
+    }
     if (!address?.id) {
       Taro.showToast({ title: '请选择收货地址', icon: 'none' })
       return
@@ -672,7 +696,7 @@ const OrderConfirm = () => {
       Taro.showToast({ title: '未找到可配送门店，请先在首页选择门店或联系管理员配置门店坐标', icon: 'none' })
       return
     }
-    if (availableTicketTotal <= 0) {
+    if (!isEditMode && availableTicketTotal <= 0) {
       Taro.showToast({ title: '暂无可用水票', icon: 'none' })
       return
     }
@@ -682,11 +706,15 @@ const OrderConfirm = () => {
       Taro.showToast({ title: '请选择送水数量', icon: 'none' })
       return
     }
-    if (finalQty > availableTicketTotal) {
+    if (!isEditMode && finalQty > availableTicketTotal) {
       Taro.showToast({ title: '水票可用次数不足', icon: 'none' })
       return
     }
-    if (goods.stock !== undefined && finalQty > goods.stock) {
+    if (isEditMode && finalQty > maxQuantity) {
+      Taro.showToast({ title: '水票可用次数不足', icon: 'none' })
+      return
+    }
+    if (goods?.stock !== undefined && finalQty > goods.stock) {
       Taro.showToast({ title: '商品库存不足', icon: 'none' })
       return
     }
@@ -704,8 +732,10 @@ const OrderConfirm = () => {
     if (!ok) return
 
     const confirmRes = await Taro.showModal({
-      title: '确认下单',
+      title: isEditMode ? '确认修改' : '确认下单',
-      content: `配送时间：${sendTimeText}\n将使用 ${finalQty} 张水票下单（优先使用可用数量少的水票），送水 ${finalQty} 桶，是否确认？`
+      content: isEditMode
+        ? `配送时间：${sendTimeText}\n送水数量：${finalQty} 桶\n是否确认修改？`
+        : `配送时间：${sendTimeText}\n将使用 ${finalQty} 张水票下单（优先使用可用数量少的水票），送水 ${finalQty} 桶，是否确认？`
     })
     if (!confirmRes.confirm) return
 
@@ -713,51 +743,59 @@ const OrderConfirm = () => {
       setSubmitLoading(true)
       Taro.showLoading({ title: '提交中...' })
 
-      // Best-effort auto dispatch rider. If it fails, backend/manual dispatch can still handle it.
+      if (isEditMode) {
-      const autoRider = storeForOrder.id ? await resolveAutoRiderForStore(storeForOrder.id) : null
+        await updateGltTicketOrder({
-
+          id: editingOrder?.id,
-      // Split this "delivery" into multiple ticket orders (backend order model binds to one userTicketId).
-      // Consume tickets with smaller available qty first.
-      let remain = finalQty
-      let created = 0
-      for (const t of ticketsToConsume) {
-        if (remain <= 0) break
-        const avail = getTicketAvailableQty(t)
-        const useQty = Math.min(remain, avail)
-        if (useQty <= 0) continue
-        await addGltTicketOrder({
-          userTicketId: Number(t.id),
-          storeId: storeForOrder.id,
           addressId: address.id,
-          totalNum: useQty,
+          totalNum: finalQty,
           buyerRemarks: orderRemark,
-          sendTime: dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+          sendTime: dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
-          // Backend may take userId from token; pass-through is harmless if backend ignores it.
-          userId,
-          riderId: Number.isFinite(Number(autoRider?.userId)) ? Number(autoRider?.userId) : undefined,
-          riderName: autoRider?.realName,
-          riderPhone: autoRider?.mobile,
-          comments: goods.name ? `立即送水：${goods.name}` : '立即送水'
         })
-        remain -= useQty
+      } else {
-        created += 1
+        // Best-effort auto dispatch rider. If it fails, backend/manual dispatch can still handle it.
-      }
+        const autoRider = storeForOrder.id ? await resolveAutoRiderForStore(storeForOrder.id) : null
 
-      if (remain > 0) {
+        // Split this "delivery" into multiple ticket orders (backend order model binds to one userTicketId).
-        // Ticket counts might have changed between loading and submission.
+        // Consume tickets with smaller available qty first.
-        throw new Error('水票可用次数不足，请刷新后重试')
+        let remain = finalQty
+        for (const t of ticketsToConsume) {
+          if (remain <= 0) break
+          const avail = getTicketAvailableQty(t)
+          const useQty = Math.min(remain, avail)
+          if (useQty <= 0) continue
+          await addGltTicketOrder({
+            userTicketId: Number(t.id),
+            storeId: storeForOrder.id,
+            addressId: address.id,
+            totalNum: useQty,
+            buyerRemarks: orderRemark,
+            sendTime: dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+            // Backend may take userId from token; pass-through is harmless if backend ignores it.
+            userId,
+            riderId: Number.isFinite(Number(autoRider?.userId)) ? Number(autoRider?.userId) : undefined,
+            riderName: autoRider?.realName,
+            riderPhone: autoRider?.mobile,
+            comments: goods?.name ? `立即送水：${goods.name}` : '立即送水'
+          })
+          remain -= useQty
+        }
+
+        if (remain > 0) {
+          // Ticket counts might have changed between loading and submission.
+          throw new Error('水票可用次数不足，请刷新后重试')
+        }
       }
 
       await loadUserTickets()
 
-      Taro.showToast({ title: created > 1 ? '下单成功（已拆分多张水票）' : '下单成功', icon: 'success' })
+      Taro.showToast({ title: isEditMode ? '修改成功' : '下单成功', icon: 'success' })
       setTimeout(() => {
         // 跳转到“我的送水订单”
         Taro.redirectTo({ url: '/user/ticket/index?tab=order' })
       }, 800)
     } catch (e: any) {
-      console.error('水票下单失败:', e)
+      console.error(isEditMode ? '送水订单修改失败:' : '水票下单失败:', e)
-      Taro.showToast({ title: e?.message || '下单失败', icon: 'none' })
+      Taro.showToast({ title: e?.message || (isEditMode ? '修改失败' : '下单失败'), icon: 'none' })
     } finally {
       Taro.hideLoading()
       setSubmitLoading(false)
@@ -772,11 +810,28 @@ const OrderConfirm = () => {
       if (!opts?.silent) setLoading(true)
       setError('')
 
-      const [goodsRes, addressRes] = await Promise.all([
+      const [addressRes, editingOrderRes, goodsByParam] = await Promise.all([
-        numericGoodsId ? getShopGoods(numericGoodsId) : Promise.resolve(null),
+        listShopUserAddress({ isDefault: true }),
-        listShopUserAddress({ isDefault: true })
+        numericOrderId ? getGltTicketOrder(numericOrderId) : Promise.resolve(null),
+        numericGoodsId ? getShopGoods(numericGoodsId) : Promise.resolve(null)
       ])
 
+      let goodsRes = goodsByParam
+      if (!goodsRes && editingOrderRes?.userTicketId) {
+        const ticketId = Number(editingOrderRes.userTicketId)
+        if (Number.isFinite(ticketId) && ticketId > 0) {
+          try {
+            const ticket = await getGltUserTicket(ticketId)
+            const gid = Number((ticket as any)?.goodsId)
+            if (Number.isFinite(gid) && gid > 0) {
+              goodsRes = await getShopGoods(gid)
+            }
+          } catch (e) {
+            console.error('加载订单关联商品失败:', e)
+          }
+        }
+      }
+
       // 设置商品信息
       if (goodsRes) {
         setGoods(goodsRes)
@@ -788,6 +843,49 @@ const OrderConfirm = () => {
         setAddress(addressRes[0])
       }
 
+      if (numericOrderId && editingOrderRes && !editingInitRef.current) {
+        editingInitRef.current = true
+        setEditingOrder(editingOrderRes)
+        Taro.setNavigationBarTitle({ title: '订单确认' })
+
+        const ds = editingOrderRes.deliveryStatus
+        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(() => {
+            Taro.navigateBack()
+          }, 600)
+          return
+        }
+
+        const initQty = Number(editingOrderRes.totalNum ?? MIN_START_QTY)
+        setQuantity(Number.isFinite(initQty) && initQty > 0 ? initQty : MIN_START_QTY)
+        setOrderRemark(String(editingOrderRes.buyerRemarks || ''))
+        const st = parseTime(editingOrderRes.sendTime)
+        if (st) setSendTime(st.startOf('day').toDate())
+
+        const addrId = Number(editingOrderRes.addressId)
+        const addrIdSafe = Number.isFinite(addrId) && addrId > 0 ? addrId : undefined
+        if (addrIdSafe) {
+          const hit = addressRes?.find(a => Number(a?.id) === addrIdSafe)
+          if (hit?.id) {
+            setAddress(hit)
+          } else {
+            try {
+              const addr = await getShopUserAddress(addrIdSafe)
+              if (addr?.id) setAddress(addr)
+            } catch (e) {
+              console.error('加载订单收货地址失败:', e)
+            }
+          }
+        }
+      }
+
       // 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 {
@@ -946,7 +1044,7 @@ const OrderConfirm = () => {
   }
 
   // 加载状态
-  if (loading || !goods) {
+  if (loading) {
     return <OrderConfirmSkeleton/>
   }
 
@@ -1017,9 +1115,20 @@ const OrderConfirm = () => {
         <Cell
           title={'配送时间'}
           extra={(
-            <View className={'flex items-center gap-2'}>
+            <Picker
-              <View className={'text-gray-900'}>{sendTimeText}</View>
+              mode="date"
-            </View>
+              value={dayjs(sendTime).format('YYYY-MM-DD')}
+              onChange={(e) => {
+                const v = (e as any)?.detail?.value
+                const d = dayjs(v)
+                if (d.isValid()) setSendTime(d.startOf('day').toDate())
+              }}
+            >
+              <View className={'flex items-center gap-2'}>
+                <View className={'text-gray-900'}>{sendTimeText}</View>
+                <ArrowRight className={'text-gray-400'} size={14} />
+              </View>
+            </Picker>
           )}
         />
       </CellGroup>

src/utils/payment.ts

@@ -19,7 +19,8 @@ export enum PaymentType {
  * 支付结果回调
  */
 export interface PaymentCallback {
-  onSuccess?: () => void;
+  // Return `false` to skip default "支付成功" toast + redirect.
+  onSuccess?: () => void | boolean | Promise<void | boolean>;
   onError?: (error: string) => void;
   onComplete?: () => void;
 }
@@ -118,17 +119,27 @@ export class PaymentHandler {
       if (paymentSuccess) {
         console.log('支付成功，订单号:', result.orderNo);
 
-        Taro.showToast({
+        // 先收起 loading，避免遮挡 modal/toast
-          title: '支付成功',
+        try {
-          icon: 'success'
+          Taro.hideLoading();
-        });
+        } catch (_e) {
+          // ignore
+        }
 
-        callback?.onSuccess?.();
+        const onSuccessResult = await callback?.onSuccess?.();
+        const skipDefaultSuccessBehavior = onSuccessResult === false;
 
-        // 跳转到订单页面
+        if (!skipDefaultSuccessBehavior) {
-        setTimeout(() => {
+          Taro.showToast({
-          Taro.navigateTo({ url: '/user/order/order' });
+            title: '支付成功',
-        }, 2000);
+            icon: 'success'
+          });
+
+          // 跳转到订单页面
+          setTimeout(() => {
+            Taro.navigateTo({ url: '/user/order/order' });
+          }, 2000);
+        }
       } else {
         throw new Error('支付未完成');
       }

src/utils/shopOrderStatus.ts

@@ -0,0 +1,65 @@
+import type { ShopOrder } from '@/api/shop/shopOrder/model';
+
+const toNum = (value: unknown): number | undefined => {
+  if (value === null || value === undefined || value === '') return undefined;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : undefined;
+};
+
+export const isShopOrderCompleted = (order: Pick<ShopOrder, 'orderStatus'>): boolean =>
+  toNum(order?.orderStatus) === 1;
+
+export const getShopOrderStatusText = (order: ShopOrder): string => {
+  const orderStatus = toNum(order?.orderStatus);
+  const deliveryStatus = toNum(order?.deliveryStatus);
+  const riderId = toNum(order?.riderId);
+
+  if (orderStatus === 2) return '已取消';
+  if (orderStatus === 3) return '取消中';
+  if (orderStatus === 4) return '退款申请中';
+  if (orderStatus === 5) return '退款被拒绝';
+  if (orderStatus === 6) return '退款成功';
+  if (orderStatus === 7) return '客户端申请退款';
+  if (orderStatus === 1) return '已完成';
+
+  if (!order?.payStatus) return '等待买家付款';
+
+  if (deliveryStatus === 10) return '待发货';
+  if (deliveryStatus === 20) {
+    if (!riderId || riderId === 0) return '待收货';
+    if (order?.sendEndTime) return '待确认收货';
+    return '配送中';
+  }
+  if (deliveryStatus === 30) return '部分发货';
+
+  if (orderStatus === 0) return '未使用';
+  return '未知状态';
+};
+
+export const getShopOrderStatusColor = (order: ShopOrder): string => {
+  const orderStatus = toNum(order?.orderStatus);
+  const deliveryStatus = toNum(order?.deliveryStatus);
+  const riderId = toNum(order?.riderId);
+
+  if (orderStatus === 2) return 'text-gray-500'; // 已取消
+  if (orderStatus === 3) return 'text-orange-500'; // 取消中
+  if (orderStatus === 4) return 'text-orange-500'; // 退款申请中
+  if (orderStatus === 5) return 'text-red-500'; // 退款被拒绝
+  if (orderStatus === 6) return 'text-green-500'; // 退款成功
+  if (orderStatus === 7) return 'text-orange-500'; // 客户端申请退款
+  if (orderStatus === 1) return 'text-green-600'; // 已完成
+
+  if (!order?.payStatus) return 'text-orange-500'; // 等待买家付款
+
+  if (deliveryStatus === 10) return 'text-blue-500'; // 待发货
+  if (deliveryStatus === 20) {
+    if (!riderId || riderId === 0) return 'text-purple-500'; // 待收货
+    if (order?.sendEndTime) return 'text-purple-500'; // 待确认收货
+    return 'text-blue-500'; // 配送中
+  }
+  if (deliveryStatus === 30) return 'text-blue-500'; // 部分发货
+
+  if (orderStatus === 0) return 'text-gray-500'; // 未使用
+  return 'text-gray-600';
+};
+