Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/youzan/logic/Goodup.php

@@ -201,10 +201,10 @@ class Goodup
                     ->where('min_num', '<=', $data['start_sale_num'])
                     ->value('delivery_fee', 0);
 
-                $desc=explode(',',$rs->good_info_img);
-                $desc_string=[];
-                foreach ($desc as $value){
-                    $desc_string[]="<img src='$value' />";
+                $desc = explode(',', $rs->good_info_img);
+                $desc_string = [];
+                foreach ($desc as $value) {
+                    $desc_string[] = "<img src='$value' />";
                 }
 
                 $update_data = array_merge($update_data, [
@@ -216,7 +216,7 @@ class Goodup
                     'start_sale_num' => $data['start_sale_num'],
                     'reject_reason' => '',
                     'post_fee' => $post_fee,
-                    'desc' => implode('',$desc_string),//商品描述
+                    'desc' => implode('', $desc_string),//商品描述
                     'good_ladder_id' => $data['good_ladder_id'],
                     'tags' => implode(',', $data['tags']),
                 ]);
@@ -227,7 +227,7 @@ class Goodup
                     'item_type' => $data['item_type'],//0实物商品
                     'title' => $rs->good_name,//商品标题
                     'is_support_barter' => $data['is_support_barter'],//是否支持换货。1：支持；0：不支持
-                    'desc' =>  implode('',$desc_string),//商品描述
+                    'desc' => implode('', $desc_string),//商品描述
                     'item_weight' => $rs->weight,
                     'category_id' => $rs->cat_id,
                     'auto_listing_time' => $data['auto_listing_time'],//0立即售出，传值表示定时(要大于当前时间戳)
@@ -257,7 +257,7 @@ class Goodup
 //                    $update_good_platform_data = array_merge($update_good_platform_data,[]);
                 } else {
                     //上架成功
-                    $update_data = array_merge($update_data, ['exam_status' => $db::$exam_status_6, 'offline_fail_reason' => '']);
+                    $update_data = array_merge($update_data, ['exam_status' => $db::$exam_status_6, 'offline_fail_reason' => '', 'online_time' => date('Y-m-d H:i:s')]);
                     if ($response['data']['plat_code'] != '') {
                         $update_data['plat_code'] = $response['data']['plat_code'];
                         $update_good_platform_data = array_merge($update_good_platform_data, ['plat_code' => $response['data']['plat_code']]);

app/youzan/logic/Order.php

@@ -18,7 +18,10 @@ class Order
     public static function getYzOrderList(array $data = [])
     {
 
-        return curl_request(config('app.yz_domain') . 'api/yz_order_list', $data);
+        $res= curl_request(config('app.yz_domain') . 'api/yz_order_list', $data);
+        $res = json_decode($res,true);
+        if($res['code']==0) return app_show(0,$res['message'],$res['data']);
+        else return error_show($res['code'],$res['message']);
 
     }