diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
index fd82bf33..37287b1c 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
@@ -103,7 +103,7 @@ public class ShopOrderBaseController extends BaseControllerImpl {
     public CommonResult cancel(@RequestParam(name = "order_id") String order_id) {
         return shopOrderBaseService.cancel(order_id);
     }
-    
+
     @ApiOperation(value = "确认收货", notes = "确认收货")
     @RequestMapping(value = "/receive", method = {RequestMethod.GET, RequestMethod.POST})
     public CommonResult receive(@RequestParam(name = "order_id") String order_id) {
@@ -326,9 +326,12 @@ public class ShopOrderBaseController extends BaseControllerImpl {
             return CommonResult.failed(ResultCode.FORBIDDEN);
         }
 
-        // 同城订单超时秒数
+        // 初定同城订单超时的秒数
         long mchOrderExpireSeconds = shopOrderBaseService.sameCityOrderExpireSeconds(2100L); // 35分钟超时，60秒*35分钟 = 2100秒
 
+        //同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单
+        Integer status = params.getInt("status");
+
         // === 构建响应数据 ===
         Map<String, Object> respMap = new HashMap<>();
         // 订单列表数据（缓存时间25分钟）
@@ -336,7 +339,7 @@ public class ShopOrderBaseController extends BaseControllerImpl {
                 storeId,
                 params.getStr("keyword"),
                 params.getInt("delivery"),
-                params.getInt("status"),
+                status,
                 params.getInt("logistics_status"),
                 mchOrderExpireSeconds,
                 params.getLong("begin_time"),
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index 5a02f88c..222b0d10 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -8907,17 +8907,16 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                         } catch (Exception e) {
                             logger.error("获取物流轨迹失败，订单ID：{}", order.getOrder_id(), e);
                         }
-                    }
-                    // 处理顺丰同城物流轨迹
-                    else if (CommonService.isSFExpress(deliveryTypeId)
-                            && orderStateId >= StateCode.ORDER_STATE_SHIPPED
-                            && orderStateId <= StateCode.ORDER_STATE_FINISH
+                    } else if (CommonService.isSFExpress(deliveryTypeId)
+                            && orderStateId.intValue() >= StateCode.ORDER_STATE_SHIPPED
+                            && orderStateId.intValue() <= StateCode.ORDER_STATE_FINISH
                             && order.getSf_order_info() != null
-                            && order.getSf_order_info().getFeed() == null) {
+                            && StrUtil.isBlank(order.getSf_order_info().getFeed())) {
                         // 获取顺丰同城的物流轨迹
                         Map<String, Object> params = new HashMap<>();
                         params.put("order_id", order.getSf_order_info().getSf_order_id());
                         try {
+
                             ThirdApiRes feedRes = sfExpressApiService.listOrderFeed(params);
                             logger.info("获取配送员物流轨迹:{}", feedRes);
                             if (feedRes != null && feedRes.getError_code() != null && feedRes.getError_code().equals(0)) {
@@ -8926,6 +8925,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                                     order.getSf_order_info().setFeed(JSONUtil.toJsonStr(result.get("feed")));
                                 }
                             }
+
                         } catch (Exception e) {
                             logger.error("获取顺丰同城物流轨迹失败，订单ID：{}", order.getOrder_id(), e);
                         }
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java
index 0a37dc87..5375ee43 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java
@@ -433,7 +433,7 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl<ShopOrderInfoMappe
 
         Integer times = orderInfo.getOrder_picked_notice_count() == null ? 0 : orderInfo.getOrder_picked_notice_count();
         if (times > 3) {
-            return CommonResult.success("已提交，请勿重复提交");
+            return CommonResult.success("已通知配送人员，请稍候");
         }
 
         // 更新订单拣货时间
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
index 3f3f298d..1c9e8289 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
@@ -190,7 +190,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
         // 为了其他顺丰店同名，店铺名称加上[门店ID]; 如：xxxx[xxxx] 聚万家生鲜超市[69]
         String shopStoreName = String.format("%s[%s]", shopMchEntry.getStore_name(), shopMchEntry.getStore_id());
 
-
         // 调用创建店铺方法
         Pair<Boolean, String> result = createSfExpressShop(
                 Convert.toInt(shopMchEntry.getStore_id()),
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index a4b55af8..0a7ab502 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -655,6 +655,7 @@
     <!--refundstatus 退款状态:0-是无退款;1-是部分退款;2-是全部退款
  orderstatus 订单状态：2010-待付款;2011-待订单审核;2012-待发货;2013-待财务审核;2014-待配货/待出库审核;2020-待发货;
 2030-待发货/待收货确认;2040-已发货/待收货确认;2050-已签收;2060-已完成/已签收;2070-已取消/已作废;2080-自提-->
+<!--    status: 同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单-->
     <!-- 公共的where条件片段 -->
     <sql id="mchOrderWhereCondition">
         <where>
@@ -684,12 +685,12 @@
                 <choose>
                     <!-- 1-进行中订单 -->
                     <when test="status != null and status == 1 and expireSeconds != null and expireSeconds > 0">
-                        AND ob.order_state_id IN (2011,2012,2013, 2014, 2020, 2030, 2040)
+                        AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040)
                         AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[>=]]> UNIX_TIMESTAMP() * 1000
                     </when>
                     <!-- 2-异常（超时）订单 -->
                     <when test="status != null and status == 2 and expireSeconds != null and expireSeconds > 0">
-                        AND ob.order_state_id IN (2011,2012,2013, 2014, 2020, 2030, 2040)
+                        AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040)
                         AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[<]]> UNIX_TIMESTAMP() * 1000
                     </when>
                     <!-- 3-退款订单 -->