From bd39472624923715d8eaa8fb746068d26f18a650 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 10 Mar 2025 11:14:09 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py                | 1 -
 app/api/endpoints/order_additional_fee.py | 6 ++++--
 app/api/endpoints/wechat.py               | 2 +-
 app/models/order.py                       | 3 ---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 6e17cce..4abf0f7 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -507,7 +507,6 @@ async def get_order_detail(
         "is_first_order": order.is_first_order,
         "cancel_reason": order.cancel_reason,
         "order_additional_fee": order_additional_fee,
-        "pay_amount": order.pay_amount,
         
         "create_time": order.create_time,
         "complete_time": order.completed_time,
diff --git a/app/api/endpoints/order_additional_fee.py b/app/api/endpoints/order_additional_fee.py
index fd227a4..df39c03 100644
--- a/app/api/endpoints/order_additional_fee.py
+++ b/app/api/endpoints/order_additional_fee.py
@@ -71,7 +71,8 @@ async def create_additional_fee_request(
         # 发送通知给用户
         user = db.query(UserDB).filter(UserDB.userid == order.userid).first()
         if user:
-            await qcloud_manager.send_sms_code_additional_fee(user.phone)
+            if not settings.DEBUG:
+                await qcloud_manager.send_sms_code_additional_fee(user.phone)
 
             if user.mp_openid:
                 #发送模板消息
@@ -215,7 +216,8 @@ async def update_additional_fee(
         # 发送通知给用户
         user = db.query(UserDB).filter(UserDB.userid == order.userid).first()
         if user:
-            await qcloud_manager.send_sms_code_additional_fee(user.phone)
+            if not settings.DEBUG:
+                await qcloud_manager.send_sms_code_additional_fee(user.phone)
 
             if user.mp_openid:
                 #发送模板消息
diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index 4860401..3edd630 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -149,7 +149,7 @@ async def create_payment(
             if not order:
                 return error_response(code=404, message="订单不存在")
             description = "蜂快到家-配送费用"
-            amount = order.pay_amount
+            amount = order.final_amount
             
         elif order_prefix == "M":  # 商家商品订单
             order = db.query(MerchantOrderDB).filter(
diff --git a/app/models/order.py b/app/models/order.py
index b478bb7..14d867c 100644
--- a/app/models/order.py
+++ b/app/models/order.py
@@ -109,9 +109,6 @@ class ShippingOrderDB(Base):
     def original_amount_with_additional_fee(self):
         return self.original_amount + self.additional_fee_amount
     
-    @property
-    def pay_amount(self):
-        return self.final_amount + self.additional_fee_amount
 
 class ShippingOrderPackageDB(Base):
     __tablename__ = "shipping_order_packages"