From ae77e1fdcb71ac32c53b72b88aead68dbf222fc9 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 2 Apr 2025 10:44:14 +0800
Subject: [PATCH] update

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

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 6047661..c898a87 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -48,7 +48,7 @@ from app.models.timeperiod import TimePeriodDB
 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
 router = APIRouter()
 
 def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: Session) -> OrderPriceResult:
@@ -906,6 +906,13 @@ async def cancel_order(
             
         db.commit()
 
+        wechat = WeChatClient()
+        await wechat.apply_refund(
+            order_id=order.orderid,
+            total_amount=int(float(order.final_amount) * 100) if not settings.DEBUG else 1,  # 转换为分
+            reason="用户取消订单"
+        )
+
         # 发送企业微信消息
         wecom_bot = WecomBot()
         order_info = OrderInfo.model_validate(order)
@@ -1160,6 +1167,13 @@ async def deliveryman_cancel_order(
         
         db.commit()
 
+        wechat = WeChatClient()
+        await wechat.apply_refund(
+            order_id=order.orderid,
+            total_amount=int(float(order.final_amount) * 100) if not settings.DEBUG else 1,  # 转换为分
+            reason="配送员取消订单"
+        )
+
         # 发送企业微信消息
         wecom_bot = WecomBot()
         order_info = OrderInfo.model_validate(order)
diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index 1318949..6455fc7 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -430,7 +430,6 @@ async def refund_notify(
                     description = f"订单取消扣除",
                     order_id = order.order_id
                 )
-        
         else:
             return error_response(code=400, message="不支持的订单类型")
         
diff --git a/jobs.sqlite b/jobs.sqlite
index 6c091db59748fef8969b6b16c0f2bd4643dbc1f4..8276d842f599a363909b71c13d0e06292d88fd0e 100644
GIT binary patch
delta 21
bcmZoTz}Rqrae@>R7vn@3Cm^{oVL?0qNO=ZE

delta 21
bcmZoTz}Rqrae@>R=l6*+PC#;F!h(1JSH}o2