From 3be466e679a6fe2093ca570ecc61280fa9b9e351 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 20 Jun 2024 20:10: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?=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20=E9=94=AE=E5=80=BC=E4=BF=AE=E6=94=B9=20=E3=80=90=E6=8F=8F=09?=
 =?UTF-8?q?=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A?=
 =?UTF-8?q?=E5=9B=A0=E8=AE=A2=E5=8D=95=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93=20?=
 =?UTF-8?q?=E9=94=AE=E5=80=BC=E4=BF=AE=E6=94=B9=20=09[=E8=BF=87=E7=A8=8B]?=
 =?UTF-8?q?=EF=BC=9Astauts=20=E6=94=B9=E4=B8=BA=20main=5Fstatus=20=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=80=BC=E4=B9=9F=E6=9C=89=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09?=
 =?UTF-8?q?=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：构建过程或辅助工具的变动
---
 FlyCube/Api/Controller/CheckController.class.php | 4 ++--
 FlyCube/Api/Controller/PayController.class.php   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/FlyCube/Api/Controller/CheckController.class.php b/FlyCube/Api/Controller/CheckController.class.php
index e5120c3..ce0b8b5 100644
--- a/FlyCube/Api/Controller/CheckController.class.php
+++ b/FlyCube/Api/Controller/CheckController.class.php
@@ -152,9 +152,9 @@ class CheckController extends PublicController
      */
     public function getOrderList()
     {
-        $field = array('order_sn,food_sn,total_weight,total_num,total_price,refund_price,receiver,tel,receive_site_id,receive_site_name,remark,product_snapshot,main_status,shipment_status,back_status,back_remark,back_time,back_addtime,addtime');
+        $field = array('order_sn,food_sn,total_weight,total_num,total_price,refund_price,receiver,tel,receive_site_id,receive_site_name,remark,product_snapshot,main_status,shipment_status,refund_status,refund_status_remark,order_time,paid_time,refunded_time,completed_time,received_time,shipped_time,delivered_time,refundapply_time,rejected_time');
         $where['openid'] = $this->openid;
-        $where['status'] = array('neq', 'canceled'); //排除已取消的订单
+        $where['main_status'] = array('neq', '已取消'); //排除已取消的订单
         $orderDb = D('order');
         if ($orderList = $orderDb->where($where)->field($field)->select()) {
             echo json_encode(array('status' => 1, 'msg' => '访问成功', "orderList" => $orderList));
diff --git a/FlyCube/Api/Controller/PayController.class.php b/FlyCube/Api/Controller/PayController.class.php
index 2a11e49..a540a82 100644
--- a/FlyCube/Api/Controller/PayController.class.php
+++ b/FlyCube/Api/Controller/PayController.class.php
@@ -68,8 +68,7 @@ class PayController extends PublicController
             exit();
         }
         if ($order['openid'] != $this->openid || (float)$order['total_price'] < (float)$shop['price_min'] || $order['total_weight'] > $shop['weight_max']) {
-            $msg = array($order['openid'], $this->openid, (float)$order['total_price'], (float)$shop['price_min'], $order['total_weight'], $shop['weight_max']);
-            echo json_encode(array('status' => 0, 'msg' => $msg));
+            echo json_encode(array('status' => 0, 'msg' => '提交信息异常'));
             exit();
         }