From 69e16d04c1c6107be0fd5ea58f4b9f444334a6db Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 17 Apr 2025 09:07:46 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py |  33 ++++++++++++++++++---------------
 jobs.sqlite                | Bin 24576 -> 24576 bytes
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index fb1108c..9f4e525 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -50,6 +50,8 @@ from app.models.community_timeperiod import CommunityTimePeriodDB
 from app.models.community_profit_sharing import CommunityProfitSharing
 from app.core.qcloud import QCloudManager
 from app.core.wechat import WeChatClient
+from app.models.community import CommunityStatus
+
 router = APIRouter()
 
 def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: Session) -> OrderPriceResult:
@@ -208,27 +210,28 @@ async def pre_order(
         if request.delivery_date and request.delivery_date < datetime.now().date():
             return error_response(code=400, message="配送日期不能选择过去的时间")
 
-        # 检查是否在服务时间
         community = db.query(CommunityDB).filter(
             CommunityDB.id == request.community_id
         ).first()
 
-        if community:
-            # 检查是否在服务时间
-            if community.weekdays and request.delivery_date:
-                if request.delivery_date.isoweekday() not in community.weekdays:
+        # 检查是否在服务时间
+        if community and community.status != CommunityStatus.OPENING:
+            return error_response(code=400, message="服务暂未开放")
 
-                    #排序
-                    sorted_weekdays = sorted(community.weekdays)
+        # 检查是否在服务时间
+        if community and community.weekdays and request.delivery_date:
+            if request.delivery_date.isoweekday() not in community.weekdays:
+                #排序
+                sorted_weekdays = sorted(community.weekdays)
 
-                    if has_consecutive_weekdays(sorted_weekdays):
-                        message = f"服务时间为: 周{sorted_weekdays[0]}-{sorted_weekdays[-1]}"
-                    else:
-                        message = f"服务时间为: "
-                        for day in sorted_weekdays:
-                            message += f"周{day}, "
-                        message = message[:-2]
-                    return error_response(code=400, message=message)
+                if has_consecutive_weekdays(sorted_weekdays):
+                    message = f"服务时间为: 周{sorted_weekdays[0]}-{sorted_weekdays[-1]}"
+                else:
+                    message = f"服务时间为: "
+                    for day in sorted_weekdays:
+                        message += f"周{day}, "
+                    message = message[:-2]
+                return error_response(code=400, message=message)
 
         # 检查是否有未支付的订单
         unpay_order = db.query(ShippingOrderDB).filter(
diff --git a/jobs.sqlite b/jobs.sqlite
index 146b9bd72e0cd757b7dabcf24aca782627e5be08..c8353bf01c92f435746de654ba64ce084c37d9fa 100644
GIT binary patch
delta 82
zcmZoTz}Rqrae_3X<3t%}M#qf_`9jS9T5fE%b(dw{{9e?Ukx^i?vUo2G`@hbP2G*%g
jlO5e<HeZ&OWdVwRlxI@l0g5woFtaeGgLM73XH)<HqCXtO

delta 82
zcmZoTz}Rqrae_3X{X`jOM*EEk`9jQpjUzVOy2~<eelKdw$jHB0S-h8p{jUW_1M5_$
j$&T(an=ebtvH-<D$}=hO0L7U(m{}OpLAw6iGb#W8Js}x(