Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -38,7 +38,8 @@ class HyStockData extends Command
         $min = date('i');
         $min = date('i');
 
 
         //9：30 - 11：30 , 13：00 - 15：00
         //9：30 - 11：30 , 13：00 - 15：00
-        if(($hour == 9 && $min >15) || $hour == 10 || ($hour == 11 && $min < 45) || $hour == 13 || $hour == 14 || ($hour == 15 && $min < 15 )){
+        if (($hour == 9 && $min > 15) || $hour == 10 || ($hour == 11 && $min < 45) || $hour == 13 || $hour == 14 || ($hour == 15 && $min < 15)) {
+            sleep(30);
             $this->get_stock();
             $this->get_stock();
         }
         }
     }
     }
@@ -87,7 +88,7 @@ class HyStockData extends Command
                 $data = $responseResult['result'][0]['data'];
                 $data = $responseResult['result'][0]['data'];
                 if ($data) {
                 if ($data) {
                     //获取最近一条
                     //获取最近一条
-                    $stock = StockData::select(['today_date', 'today_time'])->orderBy('id', 'desc')->first();
+                    $stock = StockData::orderBy('id', 'desc')->first();
                     if (empty($stock) || $data['date'] > $stock->today_date) {
                     if (empty($stock) || $data['date'] > $stock->today_date) {
                         //新增当日数据
                         //新增当日数据
                         $stock = new StockData();
                         $stock = new StockData();
@@ -112,6 +113,8 @@ class HyStockData extends Command
                         $stock->incre_per = $data['increPer'];
                         $stock->incre_per = $data['increPer'];
                         $stock->today_max = $data['todayMax'];
                         $stock->today_max = $data['todayMax'];
                         $stock->today_min = $data['todayMin'];
                         $stock->today_min = $data['todayMin'];
+                        $stock->today_start_pri = $data['todayStartPri'];
+                        $stock->yestod_end_pri = $data['yestodEndPri'];
                         $stock->tra_number = $data['traNumber'];
                         $stock->tra_number = $data['traNumber'];
                         $stock->tra_amount = $data['traAmount'];
                         $stock->tra_amount = $data['traAmount'];
                         $stock->change_per = floor(($data['traNumber'] / $all_stock_num) * 10000) / 100;
                         $stock->change_per = floor(($data['traNumber'] / $all_stock_num) * 10000) / 100;