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-10 11:03:54 +08:00
parent ddef39516f
commit 89cb377026
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/endpoints/order.py
View File

@ -497,6 +497,7 @@ async def get_order_detail(
"original_amount": order.original_amount, "original_amount": order.original_amount,
"coupon_discount_amount": order.coupon_discount_amount, "coupon_discount_amount": order.coupon_discount_amount,
"point_discount_amount": order.point_discount_amount, "point_discount_amount": order.point_discount_amount,
"additional_fee_amount": order.additional_fee_amount,
"coupon_id": order.coupon_id, "coupon_id": order.coupon_id,
"final_amount": order.final_amount, "final_amount": order.final_amount,
"deliveryman_share": order.delivery_share if order.delivery_share > 0 else calculate_delivery_share(order, current_user), "deliveryman_share": order.delivery_share if order.delivery_share > 0 else calculate_delivery_share(order, current_user),
@ -506,6 +507,7 @@ async def get_order_detail(
"is_first_order": order.is_first_order, "is_first_order": order.is_first_order,
"cancel_reason": order.cancel_reason, "cancel_reason": order.cancel_reason,
"order_additional_fee": order_additional_fee, "order_additional_fee": order_additional_fee,
"pay_amount": order.pay_amount,
"create_time": order.create_time, "create_time": order.create_time,
"complete_time": order.completed_time, "complete_time": order.completed_time,

8
app/api/endpoints/wechat.py
View File

@ -148,8 +148,8 @@ async def create_payment(
).first() ).first()
if not order: if not order:
return error_response(code=404, message="订单不存在") return error_response(code=404, message="订单不存在")
description = "配送费用" description = "蜂快到家-配送费用"
amount = order.final_amount amount = order.pay_amount
elif order_prefix == "M": # 商家商品订单 elif order_prefix == "M": # 商家商品订单
order = db.query(MerchantOrderDB).filter( order = db.query(MerchantOrderDB).filter(
@ -157,7 +157,7 @@ async def create_payment(
).first() ).first()
if not order: if not order:
return error_response(code=404, message="订单不存在") return error_response(code=404, message="订单不存在")
description = "商品购买" description = "蜂快到家-商品购买"
amount = order.pay_amount amount = order.pay_amount
elif order_prefix == "P": # 商家在线买单 elif order_prefix == "P": # 商家在线买单
@ -166,7 +166,7 @@ async def create_payment(
).first() ).first()
if not order: if not order:
return error_response(code=404, message="订单不存在") return error_response(code=404, message="订单不存在")
description = "在线买单" description = "蜂快到家-在线买单"
amount = order.amount amount = order.amount
else: else:

4
app/models/order.py
View File

@ -108,6 +108,10 @@ class ShippingOrderDB(Base):
@property @property
def original_amount_with_additional_fee(self): def original_amount_with_additional_fee(self):
return self.original_amount + self.additional_fee_amount return self.original_amount + self.additional_fee_amount
@property
def pay_amount(self):
return self.final_amount + self.additional_fee_amount
class ShippingOrderPackageDB(Base): class ShippingOrderPackageDB(Base):
__tablename__ = "shipping_order_packages" __tablename__ = "shipping_order_packages"