From 8dc361b564328a36b056f1937dd5b65da21d0530 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Thu, 4 Sep 2025 15:55:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/CartLogic.php  |  4 ++++
 app/api/logic/OrderLogic.php | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/CartLogic.php b/app/api/logic/CartLogic.php
index 5082699..ad4b53a 100644
--- a/app/api/logic/CartLogic.php
+++ b/app/api/logic/CartLogic.php
@@ -50,6 +50,10 @@ class CartLogic
         }
 
         if ($info) {
+            if($goods_num + $info['goods_num'] > 2 || $goods_num >2){
+                return '每单限额两套';
+            }
+
             //购物车内已有该商品
             $update_data = [
                 'goods_num' => $goods_num + $info['goods_num'],
diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
index 6de215a..b8087b8 100644
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -926,9 +926,17 @@ class OrderLogic extends LogicBase
     }
 
     public static function getYuyueTime($data){
+        $time = "TIME(
+        CONCAT(
+            LPAD(SUBSTRING_INDEX(start_time, ':', 1), 2, '0'),
+            ':',
+            LPAD(SUBSTRING_INDEX(start_time, ':', -1), 2, '0'),
+            ':00'
+        )
+    )";
         return Db::name("order_yuyetime")
             ->where("store_id",$data['store_id'])
-            ->order("start_time","asc")
+            ->order($time)
             ->select()
             ->toArray();
     }