Commit 6dce3032 authored by xianyang's avatar xianyang

优化公会结算

parent 41ca6def
import math import math
import threading import threading
import pandas as pd
from sqlalchemy import and_, func from sqlalchemy import and_, func
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from models.recharge import Settlement from models.recharge import Settlement
...@@ -43,9 +42,9 @@ class GuildSet(object): ...@@ -43,9 +42,9 @@ class GuildSet(object):
if param.status or param.status == 0: if param.status or param.status == 0:
is_guild_filters.append(Settlement.status == param.status) is_guild_filters.append(Settlement.status == param.status)
if param.start_time: if param.start_time:
is_guild_filters.append(Settlement.update_time >= param.start_time) is_guild_filters.append(Settlement.create_time >= param.start_time)
if param.end_time: if param.end_time:
is_guild_filters.append(Settlement.update_time <= param.end_time) is_guild_filters.append(Settlement.create_time <= param.end_time)
# 判断有无条件 # 判断有无条件
try: try:
if len(is_guild_filters) > 0: if len(is_guild_filters) > 0:
......
from sqlalchemy import Column, Integer, String, Float, DateTime from sqlalchemy import Column, Integer, String, Float, DateTime, Index
from core.storage.db import Base from core.storage.db import Base
from sqlalchemy_serializer import SerializerMixin from sqlalchemy_serializer import SerializerMixin
...@@ -74,3 +74,5 @@ class Settlement(Base, SerializerMixin): ...@@ -74,3 +74,5 @@ class Settlement(Base, SerializerMixin):
bank_name = Column(String(255), comment="开户行名称") bank_name = Column(String(255), comment="开户行名称")
bank_no = Column(String(255), comment="户头名称") bank_no = Column(String(255), comment="户头名称")
create_time = Column(DateTime, comment="申请结算时间") create_time = Column(DateTime, comment="申请结算时间")
__table_args__ = (Index('guild_id', 'status'), {'comment': '公会结算表'})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment