From a300b16018d532da3a8659f391a29ab3c002859d Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Tue, 6 Aug 2024 19:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=9E=E9=80=80=E6=AC=BE=E4=BD=86=E6=98=AF=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=BE=97=E4=B8=80=E8=B5=B7=E6=8B=BF=20?=
 =?UTF-8?q?=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=E5=93=AA?=
 =?UTF-8?q?=E6=80=95=E6=98=AF=E9=80=80=E5=AE=8C=E6=AC=BE=E5=BE=97=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B9=9F=E8=A6=81=E5=A4=84=E7=90=86=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=20=E6=94=B9=E4=B8=BA=E5=B7=B2?=
 =?UTF-8?q?=E9=80=81=E8=BE=BE=20=E6=88=96=E8=80=85=E5=9B=9E=E6=BB=9A=20?=
 =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlyCube/MpApi/Controller/AdminController.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/FlyCube/MpApi/Controller/AdminController.class.php b/FlyCube/MpApi/Controller/AdminController.class.php
index ff6bac9..d2c1c28 100644
--- a/FlyCube/MpApi/Controller/AdminController.class.php
+++ b/FlyCube/MpApi/Controller/AdminController.class.php
@@ -710,7 +710,7 @@ class AdminController extends PublicController
 		}
 	}
 	/**
-	 * @description: 获取订单列表(只拿已付款) 链表查询还有关联的站点列表的 bind_route runing字段一并取出
+	 * @description: 获取订单列表(只拿已付款 和已退款但是发货状态为 已发货 订单列表) 链表查询还有关联的站点列表的 bind_route runing字段一并取出
 	 */
 	public function getPaidOrderList()
 	{
@@ -719,7 +719,15 @@ class AdminController extends PublicController
 		}
 
 		$orderDb = D('order');
-		$where['o.main_status'] = '已付款';
+		// 构建查询条件
+		$where['_complex'] = array(
+			'_logic' => 'or',
+			array('o.main_status' => '已付款'),
+			array(
+				'o.main_status' => '已退款',
+				'o.shipment_status' => '已发货'
+			)
+		);
 		$paidOrderList = $orderDb
 			->alias('o') // 别名为 o
 			->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表