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-24 22:27:33 +08:00
parent 34b7ecfcf1
commit d6fcf919b3
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/merchant.py
View File

@ -21,6 +21,7 @@ class MerchantDB(Base):
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
user_id = Column(Integer, ForeignKey("users.userid"), nullable=False) # 归属用户 user_id = Column(Integer, ForeignKey("users.userid"), nullable=False) # 归属用户
community_id = Column(Integer, ForeignKey("communities.id"), nullable=False) # 所属小区
name = Column(String(100), nullable=False) name = Column(String(100), nullable=False)
business_hours = Column(String(100), nullable=False) # 营业时间，如 "09:00-22:00" business_hours = Column(String(100), nullable=False) # 营业时间，如 "09:00-22:00"
address = Column(String(200), nullable=False) address = Column(String(200), nullable=False)
@ -41,6 +42,7 @@ class MerchantDB(Base):
class MerchantCreate(BaseModel): class MerchantCreate(BaseModel):
user_id: int user_id: int
community_id: int # 所属小区ID
name: str = Field(..., max_length=100) name: str = Field(..., max_length=100)
business_hours: str = Field(..., max_length=100) business_hours: str = Field(..., max_length=100)
address: str = Field(..., max_length=200) address: str = Field(..., max_length=200)
@ -55,6 +57,7 @@ class MerchantCreate(BaseModel):
class MerchantApply(BaseModel): class MerchantApply(BaseModel):
name: str = Field(..., max_length=100) name: str = Field(..., max_length=100)
community_id: int = Field(..., ge=0) # 所属小区ID
business_hours: str = Field(..., max_length=100) business_hours: str = Field(..., max_length=100)
address: str = Field(..., max_length=200) address: str = Field(..., max_length=200)
longitude: float = Field(..., ge=-180, le=180, description="经度") longitude: float = Field(..., ge=-180, le=180, description="经度")
@ -70,6 +73,7 @@ class MerchantApply(BaseModel):
class MerchantUpdate(BaseModel): class MerchantUpdate(BaseModel):
user_id: Optional[int] = None user_id: Optional[int] = None
community_id: Optional[int] = None # 所属小区ID
name: Optional[str] = Field(None, max_length=100) name: Optional[str] = Field(None, max_length=100)
business_hours: Optional[str] = Field(None, max_length=100) business_hours: Optional[str] = Field(None, max_length=100)
address: Optional[str] = Field(None, max_length=200) address: Optional[str] = Field(None, max_length=200)
@ -85,6 +89,8 @@ class MerchantUpdate(BaseModel):
class MerchantInfo(BaseModel): class MerchantInfo(BaseModel):
id: int id: int
user_id: int user_id: int
community_id: int # 所属小区ID
community_name: Optional[str] = None # 用于关联查询显示小区名称
user_phone: Optional[str] = None user_phone: Optional[str] = None
user_nickname: Optional[str] = None user_nickname: Optional[str] = None
online_pay_count: Optional[int] = 0 online_pay_count: Optional[int] = 0

5
app/sql/v1.1.sql
View File

@ -155,3 +155,8 @@ ADD COLUMN product_delivery_deadline_time DATETIME COMMENT '配送截止时间
--====FINISH 3.23==== --====FINISH 3.23====
ALTER TABLE merchants
ADD COLUMN community_id INT COMMENT '所属小区' AFTER user_id,
ADD CONSTRAINT fk_merchant_community
FOREIGN KEY (community_id) REFERENCES communities(id)

BIN
jobs.sqlite
View File

Binary file not shown.