deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
aaron 2025-03-22 16:42:01 +08:00
parent 71c114825a
commit e0abc97a94
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/endpoints/merchant_order.py
View File

@ -61,6 +61,7 @@ async def create_merchant_order(
# 创建订单 # 创建订单
pay_amount = float(product.sale_price) * order.qty pay_amount = float(product.sale_price) * order.qty
gift_points = pay_amount * float(product.gift_points_rate) / 100 * settings.POINT_RATIO
db_order = MerchantOrderDB( db_order = MerchantOrderDB(
order_id=order_id, order_id=order_id,
user_id=current_user.userid, user_id=current_user.userid,
@ -71,7 +72,7 @@ async def create_merchant_order(
address_id=order.address_id, address_id=order.address_id,
order_amount=pay_amount, order_amount=pay_amount,
pay_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, status=MerchantOrderStatus.CREATED,
order_verify_code=verify_code order_verify_code=verify_code
) )
@ -352,9 +353,12 @@ async def calculate_order_price(
if not product: if not product:
return error_response(code=404, message="商品不存在") 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={ return success_response(data={
"gift_points": int(float(product.sale_price) * (float(product.gift_points_rate) / 100) * settings.POINT_RATIO), "gift_points": int(gift_points),
"amount": product.sale_price "amount": pay_amount
}) })

BIN
jobs.sqlite
View File

Binary file not shown.