Skip to content

孙龙 / test-long

Go to a project
Commit eff58a82 by 孙龙
Options

Merge branch 'master' of http://119.23.72.7/sunlong_v5/test-long 

# Conflicts:
#	erp2web_service.py
parents 834e685d b2cb675d
Inline Side-by-side
Showing with 2 additions and 3 deletions
erp2web_service.py
...@@ -62,16 +62,15 @@ class erp2web_service(base): ...@@ -62,16 +62,15 @@ class erp2web_service(base):
'user_id' : user_id, 'user_id' : user_id,
'order_sn' : order_sn, 'order_sn' : order_sn,
'order_type' : BaseConf.erp_order_source[arr['SOURCE']], 'order_type' : BaseConf.erp_order_source[arr['SOURCE']],
'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']],
"haha":"haha", "haha":"haha",
'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,
'sale_id' : sale_uid, 'sale_id' : sale_uid,
'abc':"123"
} }
#补充完成时间 #补充完成时间
if datas['status'] == '10': if datas['status'] == '10':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment