Merge remote-tracking branch 'origin/jun' into liuxiangxin

app/Http/Controllers/Api/Orders.php

@@ -1002,11 +1002,13 @@ class Orders extends Api{
 		$order['insert_time']	= date('Y-m-d H:i:s',$order['insert_time']);
 		$order['business_name']	= (string) $Business->getOne($order['business_id'],'name');
 		$order['state']			= $Model->getState($order['status'],'state');
+		$order['order_code']	= (string)$order['order_code'];
 		// 查询子订单数据
 		$order['order_items']	= $OrdersProduct->query()->where([['order_id','=',$id]])->select(['id as item_id','order_id','product_id','buy_num','pay_total','is_rebate','sku_attr_names as product_spec','product_name','product_thumb'])->get()->toArray();
 		// 处理缩略图
 		foreach ($order['order_items'] as $key => $value) {
 			$value['product_thumb']	= $value['product_thumb'] ? path_compat($value['product_thumb'])  : '';
+			$value['snowflake_id']	= (string)$value['snowflake_id'];
 			$order['order_items'][$key] = $value;
 		}
 		// 地址