From 02ed62c7f06d5824c757df341f56608b3cc24c8d Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 19 Feb 2025 11:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/order.py | 37 +++----------------------------------
 app/core/config.py         |  6 ++----
 2 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index a623d17..7e18c03 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -826,7 +826,6 @@ async def complete_order(
                     data={
                         "character_string13": order.orderid,
                         "thing3": deliveryman_user.nickname,
-                        "phone_number15": deliveryman_user.phone,
                         "time5" : datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                     },
                     miniprogram={
@@ -888,10 +887,9 @@ async def receive_order(
                     openid=order_user.mp_openid,
                     template_id=settings.DELIVERY_ORDER_RECEIVED_TEMPLATE_ID,
                     data={
-                        "character_string1": order.orderid,
-                        "time2": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-                        "thing7": deliveryman_user.nickname,
-                        "phone_number5" : deliveryman_user.phone
+                        "character_string9": order.orderid,
+                        "time8": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                        "thing3": deliveryman_user.nickname
                     },
                     miniprogram={
                         "appid": settings.WECHAT_APPID,
@@ -933,35 +931,6 @@ async def pickup_order(
         
         db.commit()
 
-
-        # 发送模板消息
-        if order.userid:
-            order_user = db.query(UserDB).filter(
-                UserDB.userid == order.userid
-            ).first()
-            if order_user.mp_openid:
-                order_deliveryman = db.query(UserDB).filter(
-                    UserDB.userid == order.deliveryman_user_id
-                ).first()
-
-                data = {
-                    "number1": order.orderid,
-                    "thing3": order_deliveryman.nickname,
-                    "phone_number8": order_deliveryman.phone,
-                    "time5" : datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                }
-                print(data)
-                
-                await mp_client.send_template_message(
-                    openid=order_user.mp_openid,
-                    template_id=settings.DELIVERY_ORDER_DELIVERING_TEMPLATE_ID,
-                    data=data,
-                    miniprogram={
-                        "appid": settings.WECHAT_APPID,
-                        "path": f"/pages/order/detail/index?id={order.orderid}"
-                    }
-                )
-
         return success_response(
             message="已标记为取货",
             data=OrderInfo.model_validate(order)
diff --git a/app/core/config.py b/app/core/config.py
index cd891b7..6ce8bfd 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -76,11 +76,9 @@ class Settings(BaseSettings):
 
     # 微信模板消息ID
     #配送订单创建成功
-    DELIVERY_ORDER_CREATED_TEMPLATE_ID: str = "N8sMeoBG6biUjWO1PbxBol6akEI6O9isSvCiB1MlVuY"
+    DELIVERY_ORDER_CREATED_TEMPLATE_ID: str = "eR7UlBRWRXEuQdVNNU6AB0MkkRwMKyUspBLyK7bFYyI"
     #配送订单接单
-    DELIVERY_ORDER_RECEIVED_TEMPLATE_ID: str = "-HJ-9uiSI8hyHD3zWEZ3Gh72LLf_qffrhJk9kTmgQU4"
-    #配送订单配送中
-    DELIVERY_ORDER_DELIVERING_TEMPLATE_ID: str = "31KA432gVcnPUxIu6eKWWxMhacPS_v3svzqwN7uTI-w"
+    DELIVERY_ORDER_RECEIVED_TEMPLATE_ID: str = "djZ8sseKX70bAKtzIfp2MFaZG60_PHDjLRxokiw0TJQ"
     #配送订单完成
     DELIVERY_ORDER_COMPLETED_TEMPLATE_ID: str = "eR7UlBRWRXEuQdVNNU6AByAOUqZd4fzxiVEYcRtXrLU"
     #配送订单取消