ad

app/admin/controller/Goodup.php

@@ -884,7 +884,7 @@ class Goodup extends Base
 	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
 			$supplierArr=$supplier_temp['data']??[];
 			$supplier=$supplierArr['child']??[];
-            $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+//            $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
 	        $cgd_supplier_code =  isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
 	        $cgd_apply_id =  isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
@@ -897,6 +897,11 @@ class Goodup extends Base
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
 		          $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
 	        }
+	         if (($this->level == 2) && ($supplierNo != $data['supplierNo'])) {
+	            $supplier_account = checkHasAccountBySupplierNos([$supplierNo,$data['supplierNo']]);
+	            if (isset($supplier_account[$supplierNo])) return json_show(1004, '该供应商已开通账号，不允许操作');
+	            if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '原供应商已开通账号，不允许操作');
+	        }
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");
@@ -969,15 +974,7 @@ class Goodup extends Base
             return error_show(1004,"参数delivery_day不能为空");
         }
         $lead_time = isset($this->post['lead_time'])&&$this->post['lead_time']!==""? intval($this->post['lead_time']) :"0";
-//        if($lead_time===""){
-//            return error_show(1004,"参数lead_time不能为空");
-//        }
         $sample_day = isset($this->post['sample_day'])&&$this->post['sample_day']!==""? intval($this->post['sample_day']):"0";
-//        if($sample_day===""){
-//            return error_show(1004,"参数sample_day不能为空");
-//        }
-     //   $sample_fee = isset($this->post['sample_fee'])&&$this->post['sample_fee']!==""? floatval
-        //($this->post['sample_fee']):"0";
         $config = isset($this->post['config'])&&$this->post['config']!==""? trim($this->post['config']):"";
         $other_config = isset($this->post['other_config'])&&$this->post['other_config']!==""? trim($this->post['other_config']):"";
         $is_diff = isset($this->post['is_diff'])&&$this->post['is_diff']!==""? intval($this->post['is_diff']):"0";
@@ -1174,15 +1171,14 @@ class Goodup extends Base
         if($market_price===""){
             return error_show(1004,"参数market_price不能为空");
         }
+        if ($this->level == 2) {
+        	            $supplier_account = checkHasAccountBySupplierNos([$data['supplierNo']]);
+        	            if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '供应商已开通账号，不允许操作');
+        }
         $nake_price = isset($this->post['nake_price'])&&$this->post['nake_price']!==""? floatval($this->post['nake_price']):"";
-//        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
-//        if($is_step===""){
-//            return error_show(1004,"参数is_step不能为空");
-//        }
+
         $good_ladder = isset($this->post['good_ladder'])&&!empty($this->post['good_ladder'])? $this->post['good_ladder']:"";
-//        if($is_step==1 &&  $good_ladder==""){
-//            return error_show(1004,"启用阶梯，阶梯价不能为空");
-//        }
+
         $data=[
             "cert_fee"=>$cert_fee,
             "packing_fee"=>$packing_fee,
@@ -2332,7 +2328,7 @@ class Goodup extends Base
 	        }
 	
 	        if (($this->level == 2) && ($supplierNo != $data['supplierNo'])) {
-	            $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+	            $supplier_account = checkHasAccountBySupplierNos([$supplierNo,$data['supplierNo']]);
 	            if (isset($supplier_account[$supplierNo])) return json_show(1004, '该供应商已开通账号，不允许操作');
 	            if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '原供应商已开通账号，不允许操作');
 	        }

app/youzan/logic/Goodup.php

@@ -9,7 +9,7 @@ use app\txx\model\YzGood;
 use app\youzan\model\PlatformYouzan;
 use think\Exception;
 use think\facade\Cache;
-use think\facade\Db;
+use think\facade\Db;use think\facade\Log;
 
 //商品处理层
 class Goodup
@@ -319,14 +319,13 @@ class Goodup
                     'distribution'=>$data['distribution'],
                 ];
                 $host = config('app.yz_domain');
-                $response = curl_request($host . 'api/yz_goodup', $curl_data);
-                $response = json_decode($response, true);
-
+                $responses = curl_request($host . 'api/yz_goodup', $curl_data);
+                $response = json_decode($responses, true);
+				Log::info("[".date('Y-m-d H:i:s')."] {$rs->skuCode} 接口yz_goodup:".$responses);
                 if (!isset($response['code'])||$response['code'] != 0) {
                     //上架失败
                     $res = false;
                     $update_data = array_merge($update_data, ['exam_status' => $db::$exam_status_7, 'offline_fail_reason' => $response['message']]);
-//                    $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' => '', 'online_time' => date('Y-m-d H:i:s')]);
@@ -671,7 +670,7 @@ class Goodup
                 //调有赞项目的接口，从有赞平台下线该商品
                 $host = config('app.yz_domain');
                 $response = curl_request($host . 'api/yz_goodup_offline', $curl_data);
-
+				Log::info('['.date('Y-m-d H:i:s')."] {$rs->skuCode} 接口offline:".$response);
                 $response = json_decode($response, true);
 
                 if ($response['code'] != 0) throw new Exception($response['message']);