From 9cbf01f2abef148751bcb6b69da5101be822251c Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 17 Nov 2025 15:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E8=87=AA?=
 =?UTF-8?q?=E4=B8=BB=E9=85=8D=E9=80=81=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/suisung/mall/common/api/StateCode.java    | 1 +
 mall-shop/src/main/resources/bootstrap-prod.yml             | 2 +-
 .../src/main/resources/mapper/order/ShopOrderBaseMapper.xml | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java
index f69f0060..ec853b84 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java
@@ -17,6 +17,7 @@ public class StateCode {
     public static final int DELIVERY_TYPE_EXP = 10;    // 普通快递
     public static final int DELIVERY_TYPE_IN_STORE_SERVICE = 15;    // 店铺配送
     public static final int DELIVERY_TYPE_SAME_CITY = 16;//顺丰同城配送
+    public static final int DELIVERY_TYPE_STORE_BY_SELF = 17; // 商家（线下）自己配送
 
     public static final Map<Integer, String> DELIVERY_TYPE_MAP = new HashMap() {
         {
diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml
index 648b70c5..54ec6388 100644
--- a/mall-shop/src/main/resources/bootstrap-prod.yml
+++ b/mall-shop/src/main/resources/bootstrap-prod.yml
@@ -184,7 +184,7 @@ feieyun:
 sf-express:
   # 顺丰同城 api 接口配置
   dev_id: 1715091463
-  # 桂平顺丰平台商家id 2273453450129   2269768012593
+  # 桂平顺丰平台商家id 2273453450129 2269768012593 2281834525297
   supplier_id: 2281834525297
   appid: 1715091463
   appkey: 47466ae69c530f831395e1bc405639fb
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index e1be6fcc..b18acf8f 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -1004,12 +1004,12 @@
                     <!-- 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 (oi.order_time + #{expireSeconds}*1000) <![CDATA[>=]]> UNIX_TIMESTAMP() * 1000
+                        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 (oi.order_time + #{expireSeconds}*1000) <![CDATA[<]]> UNIX_TIMESTAMP() * 1000
+                        AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030)
+                        AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[<=]]> UNIX_TIMESTAMP() * 1000
                     </when>
                     <!-- 3-退款订单 -->
                     <when test="status != null and status == 3">