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

# Conflicts:
#	erp2web_service.py

erp2web_service.py

@@ -56,13 +56,18 @@ class erp2web_service(base):
             order_id = self.db.table('order').getField({'order_sn' : order_sn}, 'order_id')
             self.db.startTrans()
             if order_id == None:
+                arr = json.loads(data)
+                user = arr['user']
+                user_id = 0
                 #创建订单
                 datas = {
                     'order_pay_type' : 1,
                     'user_id' : user_id,
                     "ddf":"dd",
                     'order_sn' : order_sn,
-                    'order_type' : BaseConf.erp_order_source[arr['SOURCE']],
+					'order_type' : BaseConf.erp_order_source[arr['SOURCE']],                    
+					"bgg":"456",
+                    'delivery_place' : BaseConf.erp_delivery[arr['CURRENCY']],
                     'order_shipping_type' : BaseConf.erp_shipping_type[arr['DELIVERTYPE']],
                     "haha":"haha",
                     'create_time' : int(time.mktime(time.strptime(arr['BIZDATE'], '%Y-%m-%d'))) if 'BIZDATE' in arr.keys() and arr['BIZDATE'] != '' else 0,
@@ -70,16 +75,22 @@ class erp2web_service(base):
                     'sale_id' : sale_uid,
                     'currency' : BaseConf.erp_currency[arr['CURRENCY']],
                     'abc':"123"
+                    "sfdf":"sdfdsf",
                     "bgg":"456",
                     "dfdf":"dd"
-                    'delivery_place' : BaseConf.erp_delivery[arr['CURRENCY']],
                 }
                 #补充完成时间
                 if datas['status'] == '10':
                     if datas['finish_time'] == 0 and datas['pay_time'] == 0 and datas['confirm_time'] == 0:
                         datas['finish_time'] = datas['create_time']
                         datas['confirm_time'] = 0
+                        arr = json.loads(data)
+                        user = arr['user']
+                        user_id = 0
                         datas['pay_time'] = 0
+                    elif datas['finisdddh_time'] == 0 and datas['paydd_time'] == 0:
+                        datas['finishdd_time'] = datas['ddddd']
+                        datas['pay_ddtime'] = 0
                     elif datas['finish_time'] == 0 and datas['pay_time'] == 0:
                         datas['finish_time'] = datas['confirm_time']
                         datas['pay_time'] = 0