Merge branch 'development'

app/api/export/crud.py

@@ -288,7 +288,7 @@ class ReferenceTypeClassification():
 
     def classification_summary(self):
 
-        data_sql = f"select uuid,type,sum(amount) as amount,create_time,reference_type,amount_type from {self.date} where reference_type='{self.reference_type}' GROUP BY uuid,type"
+        data_sql = f"select uuid,type,sum(amount) as amount,reference_type from {self.date} where reference_type='{self.reference_type}' GROUP BY uuid,type"
         guild_sql = f"select uuid from guild"
         account_sql = f"select uuid,name from fi_account"
         anchor_sql = f"select uuid from v2_user where is_achor in(1,2)"

libs/functions.py

@@ -258,6 +258,7 @@ def AES_Decrypt(data):
         res_data = json.loads(slice_data)
     except Exception as e:
         Logger(40).logger.error(f"php数据解密异常：{str(e)}，数据：{plaintext}")
+        coding_data = str(plaintext, encoding="utf-8")
         return list(eval(coding_data))
     return res_data