up

erp2web_service.py

@@ -58,19 +58,19 @@ class erp2web_service(base):
             if order_id == None:
                 #创建订单
                 datas = {
-                    'order_sn' : order_sn,
-                    'order_type' : BaseConf.erp_order_source[arr['SOURCE']],
                     'order_pay_type' : 1,
                     'user_id' : user_id,
+                    'order_sn' : order_sn,
+                    'order_type' : BaseConf.erp_order_source[arr['SOURCE']],
                     'order_amount' : round(float(arr['FTOTALAMOUNT']), 2),
                     'currency' : BaseConf.erp_currency[arr['CURRENCY']],
                     'delivery_place' : BaseConf.erp_delivery[arr['CURRENCY']],
                     'order_shipping_type' : BaseConf.erp_shipping_type[arr['DELIVERTYPE']],
                     'status' : BaseConf.erp_order_status[arr['BASESTATUS']],
+                    "haha":"haha",
                     '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,
                     '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,
                     'sale_id' : sale_uid,
                 }
                 #补充完成时间