Merge branch 'development' of http://gitlab.3yakj.com/xianyang/financial_system into develop/xp

 Conflicts:
	core/config/env.py
	libs/functions.py

.idea/financial-system.iml

@@ -6,7 +6,7 @@
       <excludeFolder url="file://$MODULE_DIR$/fs-env" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.8 (financial_system)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (financial-system)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

app/api/statement/crud.py

@@ -42,10 +42,19 @@ def data_to_file(db, data, name, header):
 
 class RechargeStatement(object):
     """充值报表"""
+
     def __init__(self):
-        self.linkmysql=LinkMysql(env.DB_3YV2)
+        self.linkmysql = LinkMysql(env.DB_3YV2)
         self.derive_list = []
 
+    def query_data(self, page, size):
+        count_sql = f'SELECT count(*) FROM `orders` as  d   inner join v2_user  as u on  d.userid=u.user_id where status=1'
+        count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")
+        sql = f'SELECT d.id as order_number,d.userid as user_id,u.user_number,u.nick_name,d.money,d.paychannel as pay_channel,d.sid,d.current,FROM_UNIXTIME(d.payment_time,"%Y-%c-%d %h:%i:%s") as payment_time,FROM_UNIXTIME(d.lastupdate,"%Y-%c-%d %h:%i:%s") as last_update FROM `orders` as  d   inner join v2_user  as u on  d.userid=u.user_id where status=1 ORDER BY id desc limit {page},{(size)}'
+        once_res = self.linkmysql.query_mysql(sql)
+        money_sql = f'SELECT sum(d.balanceadd) FROM `orders` as  d   inner join v2_user  as u on  d.userid=u.user_id where status=1'
+        moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(d.balanceadd)")
+        return count, once_res, moeny_data
     def query_data(self,page,size,order_number,user_id,sid,start_time,end_time):
         query=[]
         if start_time:
@@ -154,6 +163,7 @@ class RechargeStatement(object):
 
 class WithdrawStatement(object):
     """提现报表"""
+
     def __init__(self):
         self.derive_user_list = []
         self.linkmysql=LinkMysql(env.DB_3YV2)
@@ -334,7 +344,6 @@ class WithdrawStatement(object):
         return statement_list, count, moeny_data, final_money
 
 
-
 class FinanceFix(object):
 
     @staticmethod
@@ -349,7 +358,7 @@ class FinanceFix(object):
             count_sql = f"select count(id) as num from finance_fix_log where {' and '.join(finance_filters)}"
             data_sql = f"select id,type,money,unique_tag,amount_type,operator,create_time,remark from finance_fix_log where {' and '.join(finance_filters)} order by id DESC limit {(int(page) - 1) * size},{size}"
         else:
-            count_sql = f"select count(id) as num from finance_fix_log where {' and '.join(finance_filters)}"
+            count_sql = f"select count(id) as num from finance_fix_log"
             data_sql = f"select id,type,money,unique_tag,amount_type,operator,create_time,remark from finance_fix_log order by id DESC limit {(int(page) - 1) * size},{size}"
         with ThreadPoolExecutor(max_workers=2) as pool:
             future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, count_sql)

app/api/statement/schemas.py

@@ -109,14 +109,12 @@ class UserNumber(BaseModel):
 
 class CreateBill(BaseModel):
     dst_id: Optional[str] = ""
-    dst_name: str = ""
-    amount: float
+    dst_name: Optional[str] = ""
+    amount: Optional[float] = 0.0
     transfer_id: Optional[str] = ""
-    transfer_name: str = ""
     remark: Optional[str] = ""
-    type: int
-    nick_name: Optional[str] = ""
     transfer_type: Optional[str] = ""
+    type: Optional[int] = None
 
     # @validator('transfer_id')
     # def transfer_id_must_contain_space(cls, v):

app/api/statement/views.py

@@ -64,7 +64,7 @@ def guild_payment_list(page: Optional[int] = 1, size: Optional[int] = 10,start_t
 
 
 @router.post('/upload')
-async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),):
+async def uploadFile(a_file: bytes = File(...), token=Depends(login_required), ):
     a_content = a_file
     image_name = random_number()
     cos_path = new_upload_file(a_content, image_name)
@@ -74,37 +74,46 @@ async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),):
 
 
 @router.post("/payment/add")
-def guild_payment_list(data:PaymentAdd,db: Session = Depends(get_db)):
+def guild_payment_list(data: PaymentAdd, db: Session = Depends(get_db)):
     """提交打款"""
     transfer_query(data)
     return HttpResultResponse(code=200,data='')
 
 
 @router.get("/onaccount")
-def outon_account(db: Session = Depends(get_db),token=Depends(login_required)):
+def outon_account(db: Session = Depends(get_db), token=Depends(login_required)):
     """转出和转入账户人员列表"""
     account_list, total = outon_account_data(db, Account, {})
     return HttpResultResponse(total=total, data=account_list)
 
 
-@router.post("/transferlist")
-def outon_account(data: PaymentAccountlList,token=Depends(login_required),db: Session = Depends(get_db)):
+@router.get("/transferlist")
+def out_on_account(page: int,
+                   size: int,
+                   start_time: Optional[str] = "",
+                   end_time: Optional[str] = "",
+                   transfer_name: Optional[str] = "",
+                   dst_name: Optional[str] = "",
+                   token=Depends(login_required)):
     """转账列表"""
-    account_list, total = accout_list_data(db, Fitransferlog, data.dict(exclude_none=True))
+    account_list, total = accout_list_data(page=page, size=size, start_time=start_time, end_time=end_time,
+                                           transfer_name=transfer_name, dst_name=dst_name)
     return HttpResultResponse(total=total, data=account_list)
 
 
-@router.post("/query/consumable")
-def query_account_money(data: UserNumber,token=Depends(login_required),db: Session = Depends(get_db)):
+@router.get("/query/consumable")
+def query_account_money(uuid: str, token=Depends(login_required)):
     """查询账户余额"""
-    consumable = account_money(db, data)
-    return HttpResultResponse(data=int(consumable))
+    if not uuid:
+        return HttpResultResponse(code=500, msg='请输入uuid')
+    consumable = account_money(uuid)
+    return HttpResultResponse(data=consumable)
 
 
 @router.post("/query/uuid")
-def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Session = Depends(get_db)):
+def query_uuid_account(data: UserNumber, token=Depends(login_required)):
     """uuid user_number查询"""
-    user_info = query_uuid_or_user_number(db, data)
+    user_info = query_uuid_or_user_number(data)
     return HttpResultResponse(data=user_info)
 
 
@@ -122,7 +131,7 @@ def account_transfer_money(data: CreateBill, request: Request,
 
 
 @router.post("/guild/update")
-def guild_update_list(data: schemas.GuildUpdate,token=Depends(login_required)):
+def guild_update_list(data: schemas.GuildUpdate, token=Depends(login_required)):
     """公会结算"""
     GuildSet().update_guild_info(data)
     return HttpResultResponse()
@@ -158,7 +167,8 @@ def recovery_fix(page: int,
                  end_time: Optional[str] = "",
                  token=Depends(login_required)):
     """异常数据修复列表"""
-    recovery_list, total = guild.recovery_fix_data(page=page, size=size, uuid=uuid, start_time=start_time, end_time=end_time)
+    recovery_list, total = guild.recovery_fix_data(page=page, size=size, uuid=uuid, start_time=start_time,
+                                                   end_time=end_time)
     return HttpResultResponse(total=total, data=recovery_list)
 
 

core/config/env.py

@@ -12,23 +12,22 @@ from qcloud_cos import CosS3Client
 SITE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 FILE_PATH = os.path.join(SITE_ROOT, "runtime", "images")
 
-
-region ='ap-guangzhou'
+region = 'ap-guangzhou'
 token = None
-scheme ='https'
+scheme = 'https'
 # Bucket ="3yakj-center-1256890024"  #正式桶
-Bucket="fj-dc-test-1256890024"  #测试桶
+Bucket = "fj-dc-test-1256890024"  # 测试桶
 
 # Bucket="3yakj"  #测试桶
 
 # secret_id='LTAI5t6JyitXaGoGdU7mga7o'
 # secret_key='Qg69gRB0vTThX5Ur6tlqgbmvqRaUjE'
-secret_id='AKIDra5Ur292g4FCzYrwmMhAOQFsHSP9wb3S'
-secret_key='JRKyzpSr1wc5OXXUFsGPKtKfsvqcEcqw'
+secret_id = 'AKIDra5Ur292g4FCzYrwmMhAOQFsHSP9wb3S'
+secret_key = 'JRKyzpSr1wc5OXXUFsGPKtKfsvqcEcqw'
 config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token, Scheme=scheme)
 client = CosS3Client(config)
-COS_PATH ='https://fj-dc-test-1256890024.cos.ap-guangzhou.myqcloud.com'  #测试
-COS_RERURN_PATH='/images/'
+COS_PATH = 'https://fj-dc-test-1256890024.cos.ap-guangzhou.myqcloud.com'  # 测试
+COS_RERURN_PATH = '/images/'
 
 
 class Env(BaseSettings):

libs/functions.py

@@ -97,9 +97,9 @@ def search(params, method):
     }
     response = requests.post(url=url, headers=header, json=params)
     if response.status_code != 200:
-        return {"status": 0}
+        return {}
     text = json.loads(response.text)
-    return {"status": 1, 'data': text.get('data').get("result")}
+    return text
 
 
 def get_ip():