From e7829d642f04ad40d1d643267bb9ae963f865724 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Mar 2025 16:37:30 +0800
Subject: [PATCH] update

---
 app/api/endpoints/merchant_order.py |   6 ++----
 jobs.sqlite                         | Bin 24576 -> 24576 bytes
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index b0bed2c..5eb6e4f 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -278,7 +278,7 @@ async def complete_order(
                 order_id = order.order_id
             )
         
-        # 发送商家订单完成消息
+        
         user = db.query(UserDB).filter(
             UserDB.userid == order.user_id
         ).first()
@@ -291,6 +291,7 @@ async def complete_order(
         
         db.commit()
 
+        # 发送商家订单完成消息
         if user and user.mp_openid:
             data={
                 "character_string7": order_id,
@@ -339,9 +340,6 @@ async def accept_order(
     if not product:
         return error_response(code=404, message="商品不存在")
 
-    if product.delivery_type != DeliveryType.PICKUP:
-        return error_response(code=400, message="商品类型不正确")
-    
     if order.status != MerchantOrderStatus.PENDING:
         return error_response(code=400, message="订单状态不正确")
     
diff --git a/jobs.sqlite b/jobs.sqlite
index 273a0d9685abf8778eb355c5bcd7e57b558ee50d..1e9f8c0e74bd64071207fa7ac987c660ca552cbe 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_2s@I)DB#^8+!3*rGqMF!RY

delta 19
acmZoTz}Rqrae_3X??f4AM&FGI3*rGp>jugI