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

增加前端返回文案

Browse Source
This commit is contained in:
aaron 2025-02-13 11:24:07 +08:00
parent 649dc88b3a
commit 8726cb1fc3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,10 @@ async def pre_order(
"""预下单 - 计算价格""" """预下单 - 计算价格"""
price_info = calculate_price(request, current_user, db) price_info = calculate_price(request, current_user, db)
return success_response(data=price_info) return success_response(data={
"price_info": price_info,
"price_detail_text" : settings.ORDER_PREORDER_PRICE_TEXT
})
@router.post("", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_shipping_order( async def create_shipping_order(

1
app/core/config.py
View File

@ -20,6 +20,7 @@ class Settings(BaseSettings):
#订单创建成功文案 #订单创建成功文案
ORDER_SUCCESS_TEXT: str = "订单预计今晚前送达，请注意查收" ORDER_SUCCESS_TEXT: str = "订单预计今晚前送达，请注意查收"
ORDER_PREORDER_PRICE_TEXT: str = "基础费3元 (含5件包裹) 超出部分0.5元/件"
# JWT 配置 # JWT 配置
SECRET_KEY: str = "s10GmiRMmplfYWXYZLSsE3X36Ld4gVZxHgAcdqFGC20v3llv7UdOeWLBEEP3e40p" SECRET_KEY: str = "s10GmiRMmplfYWXYZLSsE3X36Ld4gVZxHgAcdqFGC20v3llv7UdOeWLBEEP3e40p"

6
app/models/station.py
View File

@ -1,5 +1,5 @@
from typing import Optional from typing import Optional
from sqlalchemy import Column, Integer, String, ForeignKey, DateTime from sqlalchemy import Column, Integer, String, ForeignKey, DateTime, DECIMAL
from sqlalchemy.sql import func from sqlalchemy.sql import func
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from .database import Base from .database import Base
@ -9,7 +9,8 @@ class StationDB(Base):
__tablename__ = "stations" __tablename__ = "stations"
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
name = Column(String(100), nullable=False) name = Column(String(50), nullable=False)
service_text = Column(String(50), nullable=False, server_default="服务时间：8:30～20:30")
community_id = Column(Integer, ForeignKey("communities.id"), index=True) community_id = Column(Integer, ForeignKey("communities.id"), index=True)
create_time = Column(DateTime(timezone=True), server_default=func.now()) create_time = Column(DateTime(timezone=True), server_default=func.now())
update_time = Column(DateTime(timezone=True), onupdate=func.now()) update_time = Column(DateTime(timezone=True), onupdate=func.now())
@ -28,6 +29,7 @@ class StationInfo(BaseModel):
name: str name: str
community_id: int community_id: int
community_name: Optional[str] = None community_name: Optional[str] = None
service_text: str
class Config: class Config:
from_attributes = True from_attributes = True