From 960a5a753bb157fe89d55eaba5101fcc8e005443 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 21 Aug 2025 15:07:17 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=87=AA=E5=8A=A9=E6=92=A4=E5=8D=95?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E5=88=86=E5=85=AC=E5=8F=B8=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9B=E6=8F=90=E8=B4=A7=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=88358=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzs/sale/order/controller/api/ApiOrderController.java | 4 ----
 .../src/main/resources/mapper/sale/order/SaOrderMapper.xml    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
index 3794ee0e..828a2bc2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
@@ -61,8 +61,6 @@ public class ApiOrderController extends BaseController {
     private ISaDeliverService iSaDeliverService;
     @Autowired
     private IOrderBusinessService iOrderBusinessService;
-    @Autowired
-    private ISaDeliverItemsService saDeliverItemsService;
 
     @DubboReference
     ICurrencyServiceApi iCurrencyServiceApi;
@@ -537,8 +535,6 @@ public class ApiOrderController extends BaseController {
         if (null != param.getCreationTimeEnd()) {
             param.setCreationTimeEnd(DateUtils.getEndTime(param.getCreationTimeEnd()));
         }
-        // 会员ID
-        Long userId = SecurityUtils.getUserId();
         // 返回的订单数据
         List<MyOrderVO> myOrderList = new ArrayList<>();
 
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
index d4bcb027..b56c51d6 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
@@ -529,7 +529,7 @@
             <choose>
                 <when test="param.orderStatus == 1">
                     <!-- 前台如果查询待发货，需要包括已合单 -->
-                    and soi.order_status in (1, 2)
+                    and soi.order_status in (1, 2, 6)
                 </when>
                 <otherwise>
                     and soi.order_status = #{param.orderStatus}