From 862b81267b08acbac8e24bee95a3b7a1f4e8c2b6 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 5 Sep 2023 10:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=AF=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 815fc767..56f8eb7d 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -903,6 +903,9 @@ class StoreOrderRepository extends BaseRepository
             case 8:
                 $param['StoreOrder.paid'] = 1;
                 break;  // 已支付
+            case 20:
+                $param['StoreOrder.status'] = 2;
+                break;  // 已收货的商品才可以继续导入
             default:
                 unset($param['StoreOrder.is_del']);
                 break;  // 全部
@@ -1709,6 +1712,7 @@ class StoreOrderRepository extends BaseRepository
     {
         $status = $where['status'] ?? '';
         unset($where['status']);
+        halt($where);
         // 未支付订单
         if ($status == 1) {
             $query = $this->dao->search($where)->where($this->getOrderType($status))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where('StoreOrder.is_del', 0);