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
76ca98d3
Commit
76ca98d3
authored
Apr 13, 2023
by
xupeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码提交
parent
42913a47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
misc.xml
.idea/misc.xml
+1
-1
guild.py
app/api/statement/guild.py
+10
-11
No files found.
.idea/misc.xml
View file @
76ca98d3
...
...
@@ -3,5 +3,5 @@
<component
name=
"JavaScriptSettings"
>
<option
name=
"languageLevel"
value=
"ES6"
/>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
project-jdk-name=
"Python 3.8 (financial
-
system)"
project-jdk-type=
"Python SDK"
/>
<component
name=
"ProjectRootManager"
version=
"2"
project-jdk-name=
"Python 3.8 (financial
_
system)"
project-jdk-type=
"Python SDK"
/>
</project>
\ No newline at end of file
app/api/statement/guild.py
View file @
76ca98d3
...
...
@@ -95,15 +95,15 @@ class GuildSet(object):
count
=
db
.
query
(
func
.
count
(
GuildSettlementLog
.
id
))
.
filter
()
.
scalar
()
return
data
,
count
def
update_guild_info
(
self
,
data
):
"""公会结算修改"""
id
=
data
.
get
(
"id"
)
guild_sql
=
f
"SELECT count(*) FROM `guild_settlement_log` where id={id})"
guild_data
=
self
.
linkmysql
.
query_mysql
(
guild_sql
)
if
guild_data
:
status
=
1
if
data
.
get
(
"status"
)
==
0
else
2
guild_sql
=
f
"UPDATE guild_settlement_log set status={status} where id={id}"
self
.
linkmysql
.
excete_mysql
(
guild_sql
)
#
def update_guild_info(self, data):
#
"""公会结算修改"""
#
id = data.get("id")
#
guild_sql = f"SELECT count(*) FROM `guild_settlement_log` where id={id})"
#
guild_data = self.linkmysql.query_mysql(guild_sql)
#
if guild_data:
#
status = 1 if data.get("status") == 0 else 2
#
guild_sql = f"UPDATE guild_settlement_log set status={status} where id={id}"
#
self.linkmysql.excete_mysql(guild_sql)
def
paymentset_guild_data
(
page
,
size
,
start_time
,
end_time
):
...
...
@@ -386,7 +386,6 @@ def create_fix_table(db: Session, param, h_list):
"timestamp"
:
get_now_timestamp
()
}
clearing_res
=
search
(
data
,
method
)
print
(
clearing_res
)
if
clearing_res
[
'status'
]:
unique_res
=
[]
if
param
.
type
==
0
:
...
...
@@ -523,7 +522,7 @@ def transfer_query(data):
def
GuildSettlementAdd
(
db
,
data
):
guild_data
=
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
work_id
==
data
.
id
)
.
first
()
if
guild_data
:
transfer_trigger_task
()
#
transfer_trigger_task()
db_export
=
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
work_id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
data
.
status
})
else
:
...
...
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