16 Commits 6bb6ace21f ... 69d696914c

Author SHA1 Message Date
  mengqiankang 69d696914c Merge remote-tracking branch 'origin/sit' into uat 1 month ago
  xiaoqinghui a2b529f443 Merge branch 'dev' into sit 1 month ago
  xiaoqinghui b54c719bcc fix:修复ord_id入库还是0.0默认值的问题 1 month ago
  xiaoqinghui e73e18e477 Merge branch 'dev' into sit 1 month ago
  xiaoqinghui 493e77f607 refactor(store): 印章URL字段:seal_url改为入驻商家的社会同一信用代码字段:ord_id 1 month ago
  mengqiankang 0827c5dfa4 dev dockerfile文件配置修复 1 month ago
  mengqiankang 58340420df uat环境 dockerfile文件配置修复 1 month ago
  mengqiankang 3379bc5a88 修改配置文件 1 month ago
  mengqiankang e76d277c77 uat环境 dockerfile文件配置修复 1 month ago
  mengqiankang d5d6d5c9f6 修改配置文件 .env配置文件格式修复 1 month ago
  mengqiankang 27c7e73b48 修改配置文件 .env配置文件格式修复 1 month ago
  mengqiankang 8a6f4f4083 修改配置文件 1 month ago
  mengqiankang ec79544182 修改配置文件 1 month ago
  mengqiankang 63fb1bb063 修改配置文件 1 month ago
  mengqiankang 114e117b8e 修改配置文件 1 month ago
  mengqiankang 848a3bdb9d 修改配置文件 1 month ago

+ 1 - 1
alien_store/db/models/contract_store.py

@@ -18,7 +18,7 @@ class ContractStore(Base, AuditMixin):
     contact_phone: Mapped[str] = mapped_column(String(20), comment="联系电话")
     signing_status: Mapped[str] = mapped_column(String(20), default="未签署", comment="签署状态(已签署,未签署,已到期,审核中)")
     contract_url: Mapped[str] = mapped_column(LONGTEXT, comment='合同URL')
-    seal_url: Mapped[str] = mapped_column(LONGTEXT, comment='印章URL')
+    ord_id: Mapped[str] = mapped_column(LONGTEXT, comment='入驻商家的社会同一信用代码')
     signing_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="签署时间")
     effective_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="生效时间")
     expiry_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="到期时间")

+ 2 - 2
alien_store/repositories/contract_repo.py

@@ -162,7 +162,7 @@ class ContractRepository:
             business_segment=user_data.business_segment,
             contact_phone=user_data.contact_phone,
             contract_url=user_data.contract_url,
-            seal_url='0.0',
+            ord_id=user_data.ord_id,
             signing_status='未签署'
         )
         self.db.add(db_templates)
@@ -328,7 +328,7 @@ class ContractRepository:
             merchant_name=getattr(templates_data, "merchant_name", None),
             contact_phone=getattr(templates_data, "contact_phone", None),
             contract_url=json.dumps([contract_item], ensure_ascii=False),
-            seal_url='0.0',
+            ord_id=getattr(templates_data, "ord_id", None),
             signing_status='未签署'
         )
         self.db.add(new_record)

+ 0 - 1
alien_store/schemas/request/contract_store.py

@@ -11,7 +11,6 @@ class TemplatesCreate(BaseModel):
     merchant_name: str = Field(description="商家姓名")
     contact_phone: str = Field(description="联系电话")
     contract_url: str | None = Field(default=None, description="合同下载地址,合同文件id,以及签署状态")
-    seal_url: str | None = Field(default=None, description="印章文件地址")
     ord_id: str = Field(description="企业用户的统一社会信用代码")
 
     @field_validator("contact_phone")

+ 2 - 2
alien_store/schemas/response/contract_store.py

@@ -28,7 +28,7 @@ class ContractStoreResponse(BaseModel):
     contact_phone: str = Field(description="联系电话")
     signing_status: str = Field(description="签署状态(已签署,未签署,已到期)")
     contract_url: str = Field(description="合同URL(JSON字符串)")
-    seal_url: str = Field(description="印章URL")
+    ord_id: str = Field(description="入驻商家的社会同一信用代码")
     signing_time: Optional[datetime] = Field(default=None, description="签署时间")
     effective_time: Optional[datetime] = Field(default=None, description="生效时间")
     expiry_time: Optional[datetime] = Field(default=None, description="到期时间")
@@ -49,7 +49,7 @@ class ContractStoreDetailResponse(BaseModel):
     contact_phone: str = Field(description="联系电话")
     signing_status: str = Field(description="签署状态(已签署,未签署,已到期)")
     contract_items: List[ContractItemResponse] = Field(description="合同项列表(解析后的 contract_url)")
-    seal_url: str = Field(description="印章URL")
+    ord_id: str = Field(description="入驻商家的社会同一信用代码")
     signing_time: Optional[datetime] = Field(default=None, description="签署时间")
     effective_time: Optional[datetime] = Field(default=None, description="生效时间")
     expiry_time: Optional[datetime] = Field(default=None, description="到期时间")