Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
孙龙
/
test-long
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b2cb675d
authored
Oct 14, 2019
by
孙龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
up
parent
764d9539
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
erp2web_service.py
erp2web_service.py
View file @
b2cb675d
...
@@ -62,16 +62,15 @@ class erp2web_service(base):
...
@@ -62,16 +62,15 @@ class erp2web_service(base):
'order_type'
:
BaseConf
.
erp_order_source
[
arr
[
'SOURCE'
]],
'order_type'
:
BaseConf
.
erp_order_source
[
arr
[
'SOURCE'
]],
'order_pay_type'
:
1
,
'order_pay_type'
:
1
,
'user_id'
:
user_id
,
'user_id'
:
user_id
,
'order_amount'
:
round
(
float
(
arr
[
'FTOTALAMOUNT'
]),
2
),
'currency'
:
BaseConf
.
erp_currency
[
arr
[
'CURRENCY'
]],
'currency'
:
BaseConf
.
erp_currency
[
arr
[
'CURRENCY'
]],
"bgg"
:
"456"
,
'delivery_place'
:
BaseConf
.
erp_delivery
[
arr
[
'CURRENCY'
]],
'delivery_place'
:
BaseConf
.
erp_delivery
[
arr
[
'CURRENCY'
]],
'order_shipping_type'
:
BaseConf
.
erp_shipping_type
[
arr
[
'DELIVERTYPE'
]],
'order_shipping_type'
:
BaseConf
.
erp_shipping_type
[
arr
[
'DELIVERTYPE'
]],
'status'
:
BaseConf
.
erp_order_status
[
arr
[
'BASESTATUS'
]],
'create_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'BIZDATE'
],
'
%
Y-
%
m-
%
d'
)))
if
'BIZDATE'
in
arr
.
keys
()
and
arr
[
'BIZDATE'
]
!=
''
else
0
,
'create_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'BIZDATE'
],
'
%
Y-
%
m-
%
d'
)))
if
'BIZDATE'
in
arr
.
keys
()
and
arr
[
'BIZDATE'
]
!=
''
else
0
,
'confirm_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'AUDITTIME'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
'AUDITTIME'
in
arr
.
keys
()
and
arr
[
'AUDITTIME'
]
!=
''
else
0
,
'confirm_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'AUDITTIME'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
'AUDITTIME'
in
arr
.
keys
()
and
arr
[
'AUDITTIME'
]
!=
''
else
0
,
'pay_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'PAYMENTDATE'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
'PAYMENTDATE'
in
arr
.
keys
()
and
arr
[
'PAYMENTDATE'
]
!=
''
else
0
,
'finish_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'COMPLETEDATE'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
'COMPLETEDATE'
in
arr
.
keys
()
and
arr
[
'COMPLETEDATE'
]
!=
''
else
0
,
'finish_time'
:
int
(
time
.
mktime
(
time
.
strptime
(
arr
[
'COMPLETEDATE'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
'COMPLETEDATE'
in
arr
.
keys
()
and
arr
[
'COMPLETEDATE'
]
!=
''
else
0
,
'sale_id'
:
sale_uid
,
'sale_id'
:
sale_uid
,
'abc'
:
"123"
}
}
#补充完成时间
#补充完成时间
if
datas
[
'status'
]
==
'10'
:
if
datas
[
'status'
]
==
'10'
:
...
...
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