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
1fc76cdb
Commit
1fc76cdb
authored
Apr 14, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化公会结算
parent
d30feaa0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
guild.py
app/api/statement/guild.py
+2
-2
No files found.
app/api/statement/guild.py
View file @
1fc76cdb
...
@@ -296,7 +296,7 @@ def transfer_trigger_task(uuid, user_id, balance, type, amount_type, remark='用
...
@@ -296,7 +296,7 @@ def transfer_trigger_task(uuid, user_id, balance, type, amount_type, remark='用
status
=
3
status
=
3
amount_type_id
=
1
if
amount_type
==
'consumable'
else
2
amount_type_id
=
1
if
amount_type
==
'consumable'
else
2
add_sql
=
f
"insert into all_record_table(user_id, type, status, reference_number, remark, money, is_add, money_data,create_time,amount_type) "
\
add_sql
=
f
"insert into all_record_table(user_id, type, status, reference_number, remark, money, is_add, money_data,create_time,amount_type) "
\
f
"values({user_id}, '{type}', {status},'{get_order()}','{remark}', {
balance * 10 if amount_type == 'consumable' else balance
* 100},1,'{json.dumps(money_data)}',{get_now_timestamp()},{amount_type_id});"
f
"values({user_id}, '{type}', {status},'{get_order()}','{remark}', {
float(balance) * 10 if amount_type == 'consumable' else float(balance)
* 100},1,'{json.dumps(money_data)}',{get_now_timestamp()},{amount_type_id});"
LinkMysql
(
env
.
DB_3YV2
)
.
perform_mysql
(
add_sql
)
LinkMysql
(
env
.
DB_3YV2
)
.
perform_mysql
(
add_sql
)
return
''
return
''
...
@@ -566,7 +566,7 @@ def GuildSettlementAdd(db, data):
...
@@ -566,7 +566,7 @@ def GuildSettlementAdd(db, data):
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
work_id
==
guild_data
.
work_id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
work_id
==
guild_data
.
work_id
)
.
update
(
{
GuildSettlementLog
.
status
:
data
.
status
,
GuildSettlementLog
.
update_time
:
get_now_timestamp
()})
{
GuildSettlementLog
.
status
:
data
.
status
,
GuildSettlementLog
.
update_time
:
get_now_timestamp
()})
db
.
commit
()
db
.
commit
()
return
''
return
200
,
''
else
:
else
:
db_export
=
GuildSettlementLog
(
work_id
=
data
.
id
,
guild_id
=
data
.
guild_id
,
balance
=
data
.
balance
,
db_export
=
GuildSettlementLog
(
work_id
=
data
.
id
,
guild_id
=
data
.
guild_id
,
balance
=
data
.
balance
,
pearl
=
data
.
pearl
,
status
=
data
.
status
,
create_time
=
data
.
create_time
,
pearl
=
data
.
pearl
,
status
=
data
.
status
,
create_time
=
data
.
create_time
,
...
...
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