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
a5b0541b
Commit
a5b0541b
authored
Apr 24, 2023
by
xupeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
状态回滚操作
parent
0962b454
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
guild.py
app/api/statement/guild.py
+7
-7
No files found.
app/api/statement/guild.py
View file @
a5b0541b
...
@@ -537,7 +537,7 @@ def GuildSettlementAdd(db, data):
...
@@ -537,7 +537,7 @@ def GuildSettlementAdd(db, data):
is_failure
=
transfer_trigger_task
(
guild_info
[
0
]
.
get
(
"uuid"
),
0
,
float
(
guild_data
.
balance
),
'guild_clear'
,
'consumable'
,
balance_refer_num
,
[],
1
,
acc_info
[
0
][
'uuid'
])
is_failure
=
transfer_trigger_task
(
guild_info
[
0
]
.
get
(
"uuid"
),
0
,
float
(
guild_data
.
balance
),
'guild_clear'
,
'consumable'
,
balance_refer_num
,
[],
1
,
acc_info
[
0
][
'uuid'
])
if
is_failure
:
if
is_failure
:
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
3
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
{
GuildSettlementLog
.
status
:
0
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
db
.
commit
()
db
.
commit
()
return
400
,
{
"msg"
:
"结算错误"
}
return
400
,
{
"msg"
:
"结算错误"
}
first_sta
=
1
first_sta
=
1
...
@@ -547,7 +547,7 @@ def GuildSettlementAdd(db, data):
...
@@ -547,7 +547,7 @@ def GuildSettlementAdd(db, data):
is_lose
=
transfer_trigger_task
(
guild_info
[
0
]
.
get
(
"uuid"
),
0
,
float
(
guild_data
.
pearl
),
'guild_clear'
,
'withdrawable'
,
pearl_refer_num
,
[],
1
,
acc_info
[
0
][
'uuid'
])
is_lose
=
transfer_trigger_task
(
guild_info
[
0
]
.
get
(
"uuid"
),
0
,
float
(
guild_data
.
pearl
),
'guild_clear'
,
'withdrawable'
,
pearl_refer_num
,
[],
1
,
acc_info
[
0
][
'uuid'
])
if
is_lose
:
if
is_lose
:
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
3
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
{
GuildSettlementLog
.
status
:
0
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
db
.
commit
()
db
.
commit
()
return
400
,
{
"msg"
:
"结算错误"
}
return
400
,
{
"msg"
:
"结算错误"
}
first_sta
=
1
first_sta
=
1
...
@@ -559,7 +559,7 @@ def GuildSettlementAdd(db, data):
...
@@ -559,7 +559,7 @@ def GuildSettlementAdd(db, data):
return
400
,
{
"msg"
:
"业务请求失败"
}
return
400
,
{
"msg"
:
"业务请求失败"
}
except
:
except
:
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
3
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
{
GuildSettlementLog
.
status
:
0
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
db
.
commit
()
db
.
commit
()
return
400
,
{
"msg"
:
"业务请求失败"
}
return
400
,
{
"msg"
:
"业务请求失败"
}
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
...
@@ -567,7 +567,7 @@ def GuildSettlementAdd(db, data):
...
@@ -567,7 +567,7 @@ def GuildSettlementAdd(db, data):
db
.
commit
()
db
.
commit
()
else
:
else
:
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
3
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
{
GuildSettlementLog
.
status
:
0
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
db
.
commit
()
db
.
commit
()
return
200
,
{
"msg"
:
"操作成功"
}
return
200
,
{
"msg"
:
"操作成功"
}
if
guild_data
.
status
==
1
:
if
guild_data
.
status
==
1
:
...
@@ -579,7 +579,7 @@ def GuildSettlementAdd(db, data):
...
@@ -579,7 +579,7 @@ def GuildSettlementAdd(db, data):
return
400
,
{
"msg"
:
"业务请求失败"
}
return
400
,
{
"msg"
:
"业务请求失败"
}
except
:
except
:
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
{
GuildSettlementLog
.
status
:
3
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
{
GuildSettlementLog
.
status
:
0
,
GuildSettlementLog
.
update_time
:
time_int_timestamp
()})
db
.
commit
()
db
.
commit
()
return
400
,
{
"msg"
:
"业务请求失败"
}
return
400
,
{
"msg"
:
"业务请求失败"
}
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
db
.
query
(
GuildSettlementLog
)
.
filter
(
GuildSettlementLog
.
id
==
data
.
id
)
.
update
(
...
@@ -591,7 +591,7 @@ def GuildSettlementAdd(db, data):
...
@@ -591,7 +591,7 @@ def GuildSettlementAdd(db, data):
pearl
=
data
.
pearl
,
status
=
data
.
status
,
create_time
=
data
.
create_time
,
pearl
=
data
.
pearl
,
status
=
data
.
status
,
create_time
=
data
.
create_time
,
update_time
=
data
.
update_time
,
guild_name
=
data
.
guild_name
,
update_time
=
data
.
update_time
,
guild_name
=
data
.
guild_name
,
guild_per
=
data
.
guild_per
,
actual_money
=
data
.
actual_money
,
guild_per
=
data
.
guild_per
,
actual_money
=
data
.
actual_money
,
pledge_deposit_money
=
data
.
pledge_deposit_money
)
pledge_deposit_money
=
data
.
pledge_deposit_money
,
account_name
=
data
.
account_name
,
bank_name
=
data
.
bank_name
,
bank_no
=
data
.
bank_no
)
db
.
add
(
db_export
)
db
.
add
(
db_export
)
db
.
commit
()
db
.
commit
()
return
200
,{
"msg"
:
"操作成功"
}
return
200
,{
"msg"
:
"操作成功"
}
...
@@ -614,7 +614,7 @@ def GuildSettlementmodify(db):
...
@@ -614,7 +614,7 @@ def GuildSettlementmodify(db):
pearl
=
item
.
get
(
"pearl"
),
status
=
item
.
get
(
"status"
),
create_time
=
time_int_timestamp
(),
pearl
=
item
.
get
(
"pearl"
),
status
=
item
.
get
(
"status"
),
create_time
=
time_int_timestamp
(),
update_time
=
time_int_timestamp
(),
guild_name
=
item
.
get
(
"guild_name"
),
update_time
=
time_int_timestamp
(),
guild_name
=
item
.
get
(
"guild_name"
),
guild_per
=
item
.
get
(
"guild_per"
),
actual_money
=
item
.
get
(
"actual_money"
),
guild_per
=
item
.
get
(
"guild_per"
),
actual_money
=
item
.
get
(
"actual_money"
),
pledge_deposit_money
=
item
.
get
(
"pledge_deposit_money"
))
pledge_deposit_money
=
item
.
get
(
"pledge_deposit_money"
)
,
account_name
=
item
.
get
(
"account_name"
),
bank_name
=
item
.
get
(
"bank_name"
),
bank_no
=
item
.
get
(
"bank_no"
)
)
db
.
add
(
db_export
)
db
.
add
(
db_export
)
db
.
commit
()
db
.
commit
()
return
200
,{
"msg"
:
"操作成功"
}
return
200
,{
"msg"
:
"操作成功"
}
\ No newline at end of file
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