优化公会账户

app/api/account/crud.py

@@ -456,9 +456,14 @@ class AccountStatistics(object):
             return res
 
     def guild_calculation(self):
+        guild_cond_list = []
         start_time = time_str_to_timestamp(self.start_time + ' 00:00:00')
         end_time = time_str_to_timestamp(self.end_time + ' 23:59:59')
-        sql = f"select guild_id,initial_money,income,outcome,create_time from v3_guild_account_detail_copy where create_time>={start_time} and create_time<{end_time}"
+        guild_cond_list.append(f" (income>0 or outcome>0 or initial_money>0) ")
+        guild_cond_list.append(f" create_time >={start_time} and create_time<= {end_time}")
+        if self.user_id:
+            guild_cond_list.append(f" guild_id={self.user_id}")
+        sql = f"select guild_id,initial_money,income,outcome,create_time from v3_guild_account_detail_copy where {' and '.join(guild_cond_list)} order by create_time DESC"
         mysql_data = LinkMysql(env.DB_3YV2).query_mysql(sql)
         return mysql_data[int(self.page - 1) * self.size: self.page * self.size], len(mysql_data)
 

app/api/account/schemas.py

@@ -54,6 +54,12 @@ class FixTable(BaseModel):
     amount_type: Optional[str] = "consumable"
     remark: str
 
+    @validator('money')
+    def money_must_contain_space(cls, c):
+        if c:
+            c = round(float(c), 3)
+        return c
+
 
 class AccountTypeUpdate(BaseModel):
     id: int = None

app/api/statement/schemas.py

@@ -91,6 +91,12 @@ class PaymentAdd(BaseModel):
     cont: str
     url: str
 
+    @validator('money')
+    def money_must_contain_space(cls, c):
+        if c:
+            c = round(float(c), 3)
+        return c
+
     def __str__(self):
         return "uuid：%s, money：%s ,cont:%s ,url:%s" % (str(self.uuid), self.money, self.cont, self.url)