From 518d8350c3f76eb18bf16c6ef971782a8801756d Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Mon, 8 Jul 2024 18:57:43 +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=9C=A8=E4=BB=98=E6=AC=BE=E6=88=90=E5=8A=9F=E5=90=8E=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=8F=96=E9=A4=90=E5=8F=B7=20=E3=80=90?=
 =?UTF-8?q?=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0]=EF=BC=9A=E5=9C=A8=E4=BB=98=E6=AC=BE=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=20=E6=B7=BB=E5=8A=A0=20=E5=8F=96=E9=A4=90?=
 =?UTF-8?q?=E5=8F=B7=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=20=E5=B7=B2=E4=BB=98=E6=AC=BE=20=E5=B7=B2?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=20=E6=80=BB=E6=95=B0+1=20=E4=B8=BA=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E6=88=90=E5=8A=9F=E5=90=8E=20=E7=9A=84=E5=8F=96?=
 =?UTF-8?q?=E9=A4=90=E5=8F=B7=20ps:=E5=8F=96=E9=A4=90=E5=8F=B7=E5=8F=AA?=
 =?UTF-8?q?=E5=9C=A8=E5=BD=93=E5=A4=A9=20=E9=80=92=E5=A2=9E=20=09[?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F?=
 =?UTF-8?q?=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/PayController.class.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/FlyCube/Api/Controller/PayController.class.php b/FlyCube/Api/Controller/PayController.class.php
index 09e7e33..56a350f 100644
--- a/FlyCube/Api/Controller/PayController.class.php
+++ b/FlyCube/Api/Controller/PayController.class.php
@@ -103,16 +103,27 @@ class PayController extends PublicController
             $result = Pay::wechat($this->config)->callback();
             // 验证成功，处理业务逻辑
             if ($result['resource']['ciphertext']['trade_state'] == 'SUCCESS') {
+                $shop_id = $result['resource']['ciphertext']['attach'];
                 $where['order_sn'] = $result['resource']['ciphertext']['out_trade_no']; // 获取订单号
                 $orderDb = D('order'); // 实例化订单模型
                 $data['main_status'] = '已付款'; // 更新订单状态为已支付
                 $data['paid_time'] = time(); //标记付款时间
                 $data['pay_sn'] = $result['resource']['ciphertext']['transaction_id']; // 支付订单号
-                // 更新订单
+                /*设置取餐号*/
+                // 获取当前时间的开始和结束时间戳
+                $startTime = strtotime('today');
+                $endTime = strtotime('tomorrow') - 1;
+                $whereFoodSn['main_status'] = array('in', array('已付款', '已退款'));
+                $whereFoodSn['order_time'] = array('between', array($startTime, $endTime));
+                $whereFoodSn['shop_id'] = $shop_id;
+                $orderCount = D('order')->where($whereFoodSn)->count();
+                // 新的food_sn为今天订单数加1
+                $data['food_sn'] = $orderCount + 1;
+                /*更新订单*/
                 $orderDb->where($where)->data($data)->save();
             }
             // 构建发布主题 并向地面终端提示刷新信息
-            $topic = 'refreshQuestList/' . $result['resource']['ciphertext']['attach'];
+            $topic = 'refreshQuestList/' . $shop_id;
             $this->publish($topic, 1);
         } catch (\Exception $e) {
             // 捕获并记录可能的异常