结算列表代码提交

app/api/statement/views.py

@@ -57,7 +57,7 @@ def guild_withdrawal_list(request:Request,db: Session = Depends(get_db),page: Op
 
 @router.get("/guild/settlement")
 def guild_settlement_list(db: Session = Depends(get_db),page: Optional[int] = 1, size: Optional[int] = 10,status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",guild_id:Optional[str]=""):
-    """公会结算"""
+    """申请结算列表"""
     guild_list, total = GuildSet().get_guild_data(db,page, size,status,start_time,end_time,guild_id)
     return HttpResultResponse(total=total, data=guild_list)
 

models/guild.py

@@ -140,11 +140,14 @@ class GuildSettlementLog(Base, SerializerMixin):
     work_id =Column(Integer, comment="业务id")
     guild_id = Column(Integer, comment="公会id")
     balance = Column(DECIMAL(15,3),default='0.000',comment="结算时的钻石,RMB单位")
+    bank_name =Column(String(122), comment="开户行名称")
+    bank_no =Column(String(122), comment="账户名称")
+    guild_name =Column(String(122), comment="公会名字")
     pearl = Column(DECIMAL(15,3),default='0.000', comment="结算时候的珍珠，RMB单位")
     status = Column(Integer, comment="0待结算，1待结款，2已完成")
     create_time = Column(Integer,default='0',comment="创建时间")
     update_time = Column(DateTime,default='0',comment="修改时间")
-    guild_name = Column(Integer, comment="公会名字")
+    account_name = Column(String(122), comment="户头名称")
     guild_per = Column(String(122), comment="公会比例")
     actual_money = Column(DECIMAL(15,3), default='0.000', comment="实际结款")
     pledge_deposit_money = Column(DECIMAL, default='0.000', comment="质押金金额")