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:14:09 +08:00
parent 89cb377026
commit bd39472624
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,7 +507,6 @@ 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,

6
app/api/endpoints/order_additional_fee.py
View File

@ -71,7 +71,8 @@ async def create_additional_fee_request(
# 发送通知给用户 # 发送通知给用户
user = db.query(UserDB).filter(UserDB.userid == order.userid).first() user = db.query(UserDB).filter(UserDB.userid == order.userid).first()
if user: if user:
await qcloud_manager.send_sms_code_additional_fee(user.phone) if not settings.DEBUG:
await qcloud_manager.send_sms_code_additional_fee(user.phone)
if user.mp_openid: if user.mp_openid:
#发送模板消息 #发送模板消息
@ -215,7 +216,8 @@ async def update_additional_fee(
# 发送通知给用户 # 发送通知给用户
user = db.query(UserDB).filter(UserDB.userid == order.userid).first() user = db.query(UserDB).filter(UserDB.userid == order.userid).first()
if user: if user:
await qcloud_manager.send_sms_code_additional_fee(user.phone) if not settings.DEBUG:
await qcloud_manager.send_sms_code_additional_fee(user.phone)
if user.mp_openid: if user.mp_openid:
#发送模板消息 #发送模板消息

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

@ -149,7 +149,7 @@ async def create_payment(
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.final_amount
elif order_prefix == "M": # 商家商品订单 elif order_prefix == "M": # 商家商品订单
order = db.query(MerchantOrderDB).filter( order = db.query(MerchantOrderDB).filter(

3
app/models/order.py
View File

@ -109,9 +109,6 @@ class ShippingOrderDB(Base):
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"