Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Reorder.php

@@ -943,8 +943,9 @@ class Reorder extends Base
                             return error_show(1005, '可售商品入库失败');
                         }
                         $stockid = isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID();
-                        $sabebn =Db::name("sale_info")->where(["orderCode"=>$orderinfo["orderCode"]])->select()->toArray();
-                        if(!empty($sabebn)){
+                        if ($orderinfo['is_stock'] == 1){
+                        	$sabebn =Db::name("sale_info")->where(["orderCode"=>$orderinfo["orderCode"]])->select()->toArray();
+                            if(!empty($sabebn)){
                         	$total_num =$info['num'];
                         	foreach ($sabebn as $ve){
                         		$tempnum=0;
@@ -976,6 +977,8 @@ class Reorder extends Base
                         		}
                         	}
                         }
+                        }
+
 
                         $good_data = ['good_log_code' => $info['returnCode'], "stock_id" => $stockid, "type" => 1, 'stock'=> $info['num'], "stock_name" => "usable_stock"];
                         GoodLog::LogAdd($this->post['token'], $good_data, 'XSTHD');