From e0abc97a94ab766807e5c3908686ef9f69e70a29 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sat, 22 Mar 2025 16:42:01 +0800
Subject: [PATCH] update

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

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index 124a755..5a41ec9 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -61,6 +61,7 @@ async def create_merchant_order(
 
     # 创建订单
     pay_amount = float(product.sale_price) * order.qty
+    gift_points = pay_amount * float(product.gift_points_rate) / 100 * settings.POINT_RATIO
     db_order = MerchantOrderDB(
         order_id=order_id,
         user_id=current_user.userid,
@@ -71,7 +72,7 @@ async def create_merchant_order(
         address_id=order.address_id,
         order_amount=pay_amount,
         pay_amount=pay_amount,
-        gift_points=int(float(product.sale_price) * (float(product.gift_points_rate) / 100) * settings.POINT_RATIO),
+        gift_points=gift_points,
         status=MerchantOrderStatus.CREATED,
         order_verify_code=verify_code
     )
@@ -352,9 +353,12 @@ async def calculate_order_price(
     if not product:
         return error_response(code=404, message="商品不存在")
     
+    pay_amount = float(product.sale_price) * order.qty
+    gift_points = pay_amount * float(product.gift_points_rate) / 100 * settings.POINT_RATIO
+
     return success_response(data={
-        "gift_points": int(float(product.sale_price) * (float(product.gift_points_rate) / 100) * settings.POINT_RATIO),
-        "amount": product.sale_price
+        "gift_points": int(gift_points),
+        "amount": pay_amount
     })
 
 
diff --git a/jobs.sqlite b/jobs.sqlite
index 98fabdebfa774e6e97dd64e8716cf3fb20c9a838..f4c1ce6c3273383fda04503ad9cd41f1130f3261 100644
GIT binary patch
delta 19
bcmZoTz}Rqrae_4C$%!(~j3+lHEQkjHOfLt*

delta 19
bcmZoTz}Rqrae_4C#)&e{j2ky5EQkjHO2-G1