Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
financial-system
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xianyang
financial-system
Commits
8d49f001
Commit
8d49f001
authored
Feb 24, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务修复列表
parent
77b6b2ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
2 deletions
+40
-2
.gitignore
.gitignore
+2
-1
crud.py
app/api/statement/crud.py
+14
-1
views.py
app/api/statement/views.py
+8
-0
recharge.py
models/recharge.py
+16
-0
No files found.
.gitignore
View file @
8d49f001
...
@@ -8,4 +8,5 @@
...
@@ -8,4 +8,5 @@
*-workspace
*-workspace
*.db
*.db
fs-env/
fs-env/
.idea/
.idea/
\ No newline at end of file
static/
\ No newline at end of file
app/api/statement/crud.py
View file @
8d49f001
...
@@ -7,7 +7,9 @@ from core.config.env import env
...
@@ -7,7 +7,9 @@ from core.config.env import env
from
libs.db_link
import
LinkMysql
from
libs.db_link
import
LinkMysql
from
starlette.responses
import
StreamingResponse
from
starlette.responses
import
StreamingResponse
from
sqlalchemy.orm
import
Session
from
sqlalchemy.orm
import
Session
from
models.recharge
import
Recharge
,
UserWC
,
GuildWC
from
libs.functions
import
wrapper_out
from
models.recharge
import
Recharge
,
UserWC
,
GuildWC
,
FinanceFixLog
locka
=
threading
.
Lock
()
locka
=
threading
.
Lock
()
...
@@ -208,3 +210,14 @@ class WithdrawStatement(object):
...
@@ -208,3 +210,14 @@ class WithdrawStatement(object):
final_count
=
df
[
'final_money'
]
.
apply
(
lambda
x
:
float
(
x
))
.
sum
()
final_count
=
df
[
'final_money'
]
.
apply
(
lambda
x
:
float
(
x
))
.
sum
()
return
guild_info
[(
int
(
cond
.
page
)
-
1
)
*
cond
.
size
:
cond
.
size
*
cond
.
page
],
total
,
count
,
final_count
return
guild_info
[(
int
(
cond
.
page
)
-
1
)
*
cond
.
size
:
cond
.
size
*
cond
.
page
],
total
,
count
,
final_count
return
[],
0
,
0
,
0
return
[],
0
,
0
,
0
class
FinanceFix
(
object
):
@
staticmethod
@
wrapper_out
()
def
get_finance_fix_data
(
db
:
Session
,
data
):
"""财务修复"""
total
=
db
.
query
(
func
.
count
(
FinanceFixLog
.
id
))
.
scalar
()
output
=
db
.
query
(
FinanceFixLog
)
.
limit
(
data
.
page
*
data
.
size
)
.
offset
((
data
.
page
-
1
)
*
data
.
size
)
.
all
()
return
[
i
.
to_dict
()
for
i
in
output
],
total
app/api/statement/views.py
View file @
8d49f001
from
app.api.statement
import
crud
,
schemas
from
app.api.statement
import
crud
,
schemas
from
app.api.account
import
schemas
as
acc_schemas
from
app
import
get_db
from
app
import
get_db
from
fastapi
import
Depends
,
APIRouter
from
fastapi
import
Depends
,
APIRouter
from
sqlalchemy.orm
import
Session
from
sqlalchemy.orm
import
Session
...
@@ -49,3 +50,10 @@ def guild_update_list(data: schemas.GuildUpdate, db: Session = Depends(get_db)):
...
@@ -49,3 +50,10 @@ def guild_update_list(data: schemas.GuildUpdate, db: Session = Depends(get_db)):
"""公会结算"""
"""公会结算"""
GuildSet
()
.
update_guild_info
(
db
,
data
)
GuildSet
()
.
update_guild_info
(
db
,
data
)
return
HttpResultResponse
()
return
HttpResultResponse
()
@
router
.
post
(
"/finance/fix"
)
def
finance_fix
(
data
:
acc_schemas
.
PublicModel
,
db
:
Session
=
Depends
(
get_db
)):
"""账户修复报表"""
res
,
num
=
crud
.
FinanceFix
.
get_finance_fix_data
(
db
,
data
)
return
HttpResultResponse
(
total
=
num
,
data
=
res
)
\ No newline at end of file
models/recharge.py
View file @
8d49f001
...
@@ -82,3 +82,19 @@ class Settlement(Base, SerializerMixin):
...
@@ -82,3 +82,19 @@ class Settlement(Base, SerializerMixin):
create_time
=
Column
(
DateTime
,
comment
=
"申请结算时间"
)
create_time
=
Column
(
DateTime
,
comment
=
"申请结算时间"
)
__table_args__
=
{
'comment'
:
'公会结算表'
}
__table_args__
=
{
'comment'
:
'公会结算表'
}
class
FinanceFixLog
(
Base
,
SerializerMixin
):
"""财务修复日志"""
__tablename__
=
"finance_fix_log"
id
=
Column
(
Integer
,
primary_key
=
True
,
index
=
True
)
type
=
Column
(
Integer
,
comment
=
"0系统账户1私有账户"
)
money
=
Column
(
Float
,
comment
=
"修复金额"
)
unique_tag
=
Column
(
String
(
128
),
comment
=
"唯一标识"
)
amount_type
=
Column
(
String
(
128
),
comment
=
"账户类型"
)
remark
=
Column
(
String
(
255
),
comment
=
"备注"
)
operator
=
Column
(
String
(
255
),
comment
=
"操作员(每笔转账都要记录一下)"
)
operator_id
=
Column
(
Integer
,
comment
=
"操作员id(可能设计到改了名字,记id比较好)"
)
create_time
=
Column
(
DateTime
,
comment
=
"创建时间"
)
__table_args__
=
{
'comment'
:
'财务修复日志'
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment