From 88030c058019f0f546356929b32a8676afd871df Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Fri, 21 Jun 2024 19:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A3=9E=E6=9C=BA=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=AB=AF=20=E8=AE=BE=E7=BD=AE=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8E=A5=E5=8F=A3=20=E3=80=90=E6=8F=8F=09=E8=BF=B0?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=AE=A2=E5=8D=95=E8=A1=A8=20=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=20=09[=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B]=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=20=E7=9A=84=E9=94=AE=E5=80=BC?=
 =?UTF-8?q?=E7=AD=89=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 .../Controller/PlaneController.class.php      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php
index 6c213a6..50a24c3 100644
--- a/FlyCube/MpApi/Controller/PlaneController.class.php
+++ b/FlyCube/MpApi/Controller/PlaneController.class.php
@@ -526,7 +526,7 @@ class PlaneController extends PublicController
 		}
 	}
 	/**
-	 * @description: 改变订单状态或退款字段  不处理 已取消 未付款 交易关闭的订单
+	 * @description: 只处理 主状态 为 已付款  的订单
 	 */
 	public function questAss()
 	{
@@ -539,9 +539,8 @@ class PlaneController extends PublicController
 			$orderDb = D('order');
 			$field = array('status', 'back', 'openid');
 			$order = $orderDb->where($where)->field($field)->find();
-			//不处理订单状态处于 已取消 未付款 交易关闭的情况
-			//不处理订单退款状态处于 主动退款 已退款 拒绝退款的状况
-			if ($order['status'] == 'canceled' || $order['status'] == 'unpaid' || $order['status'] == 'closed' || $order['back'] == 'actively' || $order['back'] == 'rejected' || $order['back'] == 'rejected' || $order['back'] == 'refunded') {
+			//只处理主状态已付款的订单 其他状态跳出
+			if ($order['main_status'] != '已付款') {
 				echo json_encode(array('status' => 0, 'msg' => '参数有误'));
 				exit();
 			}
@@ -550,14 +549,16 @@ class PlaneController extends PublicController
 			exit();
 		}
 		//操作数据库
-		if ($_REQUEST['state'] == 'status') {
-			$data['status'] = $_REQUEST['val']; //改变订单状态
-		} elseif ($_REQUEST['state'] == 'back') {
-			$data['back'] = $_REQUEST['val']; //改变订单状态
+		if ($_REQUEST['state'] == 'main_status') {
+			$data['main_status'] = $_REQUEST['val'];
+		} elseif ($_REQUEST['state'] == 'shipment_status') {
+			$data['shipment_status'] = $_REQUEST['val'];
+		} elseif ($_REQUEST['state'] == 'refund_status') {
+			$data['refund_status'] = $_REQUEST['val'];
 		}
 		if ($orderDb->where($where)->save($data)) { //修改数据
 			$topicPrefix = makeTopicPrefix($order['openid']); //小程序端用户订阅主题的前缀 ps:订单对应的用户的openid算出来的
-			// 提醒小程序端 刷新订单列表
+			// 提醒小程序端 刷新订单列表(mqtt)
 			$this->publish('refreshOrderList/' . $topicPrefix, 1);
 			echo json_encode(array('status' => 1, 'msg' => '订单修改成功'));
 		} else {