Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
Automat
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
冯佳佳
Automat
Commits
e0ba97f8
Commit
e0ba97f8
authored
Feb 21, 2022
by
Aeolus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
7defbc5a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
+4
-1
myapps/automat/api/rent_portal.py
+4
-1
No files found.
myapps/automat/api/rent_portal.py
View file @
e0ba97f8
...
@@ -102,11 +102,13 @@ def create_rent():
...
@@ -102,11 +102,13 @@ def create_rent():
rent
.
rent_type
=
type
rent
.
rent_type
=
type
rent
.
mch_platform
=
machine
.
mch_platform
rent
.
mch_platform
=
machine
.
mch_platform
rent
.
place_id
=
machine
.
place_id
rent
.
place_id
=
machine
.
place_id
rent
.
business_id
=
machine
.
business_id
rent_detail
=
RentDetail
()
rent_detail
=
RentDetail
()
rent_detail
.
rent_no
=
rent_no
rent_detail
.
rent_no
=
rent_no
rent_detail
.
user_id
=
rent
.
user_id
rent_detail
.
user_id
=
rent
.
user_id
rent_detail
.
machine_no
=
rent
.
machine_no
rent_detail
.
machine_no
=
rent
.
machine_no
rent_detail
.
business_id
=
rent
.
business_id
rent_detail
.
hatch_no
=
open_hatch
.
hatch_no
rent_detail
.
hatch_no
=
open_hatch
.
hatch_no
rent_detail
.
production_id
=
open_hatch
.
production_id
rent_detail
.
production_id
=
open_hatch
.
production_id
rent_detail
.
production_name
=
open_hatch
.
production_name
rent_detail
.
production_name
=
open_hatch
.
production_name
...
@@ -242,6 +244,7 @@ def wx_pay_callback():
...
@@ -242,6 +244,7 @@ def wx_pay_callback():
rent
=
Rent
()
rent
=
Rent
()
rent
.
rent_no
=
rent_no
rent
.
rent_no
=
rent_no
rent
.
machine_no
=
machine
.
machine_no
rent
.
machine_no
=
machine
.
machine_no
rent
.
business_id
=
machine
.
business_id
rent
.
user_id
=
user_id
rent
.
user_id
=
user_id
rent
.
place_id
=
machine
.
place_id
rent
.
place_id
=
machine
.
place_id
rent
.
total
=
int
(
callback_data
[
"total_fee"
])
rent
.
total
=
int
(
callback_data
[
"total_fee"
])
...
@@ -255,7 +258,6 @@ def wx_pay_callback():
...
@@ -255,7 +258,6 @@ def wx_pay_callback():
if
prepay_id
:
if
prepay_id
:
rent
.
prepay_id
=
prepay_id
rent
.
prepay_id
=
prepay_id
total_fee
=
0
total_fee
=
0
hatchs
=
Hatch
.
query
.
filter
(
Hatch
.
machine_no
==
machine_no
,
Hatch
.
hatch_no
.
in_
(
open_hatchs
.
keys
()))
.
order_by
(
hatchs
=
Hatch
.
query
.
filter
(
Hatch
.
machine_no
==
machine_no
,
Hatch
.
hatch_no
.
in_
(
open_hatchs
.
keys
()))
.
order_by
(
...
@@ -266,6 +268,7 @@ def wx_pay_callback():
...
@@ -266,6 +268,7 @@ def wx_pay_callback():
rent_detail
.
rent_no
=
rent_no
rent_detail
.
rent_no
=
rent_no
rent_detail
.
user_id
=
rent
.
user_id
rent_detail
.
user_id
=
rent
.
user_id
rent_detail
.
machine_no
=
rent
.
machine_no
rent_detail
.
machine_no
=
rent
.
machine_no
rent_detail
.
business_id
=
rent
.
business_id
rent_detail
.
hatch_no
=
i
.
hatch_no
rent_detail
.
hatch_no
=
i
.
hatch_no
rent_detail
.
production_id
=
i
.
production_id
rent_detail
.
production_id
=
i
.
production_id
rent_detail
.
production_name
=
i
.
production_name
rent_detail
.
production_name
=
i
.
production_name
...
...
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