wugg 1 gadu atpakaļ
vecāks
revīzija
8ce62a6bd6

+ 3 - 2
app/admin/controller/Goodup.php

@@ -478,11 +478,11 @@ class Goodup extends Base
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=''? trim($this->post['supplierNo']):'';
         $supplierArr=[];
         $supplier=[];
+         $userCommon= \app\admin\common\User::getIns();
         if($isCombind==0){
 	        if($supplierNo==''){
 	            return error_show(1004,'参数supplierNo不能为空');
 	        }
-	        $userCommon= \app\admin\common\User::getIns();
 	        $supplier_temp =$userCommon->handle('hqInfo',['code'=>$supplierNo]);
 	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
 			$supplierArr=$supplier_temp['data']??[];
@@ -879,9 +879,10 @@ class Goodup extends Base
          $isCombind= $this->post['is_combind']??0;
         $supplierArr=[];
         $supplier=[];
+        $userCommon= \app\admin\common\User::getIns();
         if($isCombind==0){
 	        if($supplierNo=='')return error_show(1004,'参数supplierNo不能为空');
-	        $userCommon= \app\admin\common\User::getIns();
+	        
 			$supplier_temp =$userCommon->handle('hqInfo',['code'=>$supplierNo]);
 	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
 			$supplierArr=$supplier_temp['data']??[];

+ 1 - 1
app/command/handleYzOrderData.php

@@ -440,7 +440,7 @@ class handleYzOrderData extends Command
 
                 //回调更新有赞订单数据
                 $callback_rs = $this->callbackYz(['status' => 6, 'id' => $c_data['id'], 'orderCode' => $orderCode]);
-                if ($callback_rs['code'] != 0) throw new Exception($callback_rs['message']);
+                if ($callback_rs['code'] != 0) throw new \Exception($callback_rs['message']);
 
                 //将采购单数据塞入到队列中
                 if ($this->cgd_data) {