From fcc0e6a43dc782bd51cbde3caca56360e3b44df6 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 28 Mar 2025 20:17:30 +0800
Subject: [PATCH] update

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

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index f9a5c7b..28972e1 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -494,18 +494,18 @@ async def verify_order(
 
 
         # 如果有积分奖励，赠送积分
-        if order.MerchantProductDB.gift_points > 0:
+        if order.MerchantOrderDB.gift_points > 0:
             point_manager = PointManager(db)
             point_manager.add_points(
                 user_id=order.MerchantOrderDB.user_id,
-                points=order.MerchantProductDB.gift_points,
+                points=order.MerchantOrderDB.gift_points,
                 description=f"团购券核销奖励",
                 order_id=order.MerchantOrderDB.order_id
             )
 
         # 对商家进行结算
         account_manager = AccountManager(db)
-        settlement_amount = float(order.MerchantProductDB.settlement_amount)
+        settlement_amount = float(order.MerchantProductDB.settlement_amount) * order.MerchantOrderDB.qty
         if settlement_amount > 0:
             account_manager.change_balance(
                 user_id=order.MerchantDB.user_id,
diff --git a/jobs.sqlite b/jobs.sqlite
index 0c648b9ff27baa3308218d80ca670767556a94d0..eafa61cb9bca43943cf282b0cffbd5f367cc6d7c 100644
GIT binary patch
delta 19
bcmZoTz}Rqrae_4C(TOt7j7K*nEQkjHOY;Z1

delta 19
bcmZoTz}Rqrae_4C{)sZqjQckxEQkjHOPL3*