update

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="订单状态不正确")