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 0c648b9..eafa61c 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ