1

core/CoreApp/controllers/Api.php

@@ -768,7 +768,12 @@ class Api extends Start_Controller {
 			//$fs = $this->notice->get_ordertatus(216);//216成功状态
 			foreach ($data as $v)
 		    {
-			    $ddh = substr($v['orderinfo'],1);
+				if($v['shop'] == 5){
+					$ddh = $v['orderinfo'];
+				}else{
+					$ddh = substr($v['orderinfo'],1);
+				}
+			    
 			    $ydh = $v['waybill'];
 			    $xg = $v;//此订单数据
 			    $shop = $datashop[$xg['shop']];//此订单店铺
@@ -897,7 +902,12 @@ class Api extends Start_Controller {
 			}
 			else
 			{
-			    $ddh = substr($value['orderinfo'],1);
+				if($value['shop'] == 5){
+					$ddh = $value['orderinfo'];
+				}else{
+					$ddh = substr($value['orderinfo'],1);
+				}
+			    
 			    $ydh = $value['waybill'];
 			    $xg = $value;//此订单数据
 			    $shop = $datashop[$xg['shop']];//此订单店铺

core/CoreApp/controllers/Fullorder.php

@@ -1360,6 +1360,14 @@ class Fullorder extends Start_Controller {
 			//未出库或者（已退库并且订单的状态不是等待买家收货和代发货状态）
 			if($data['library'] == 1 || ($data['library'] != 2 && ($post['state'] != '207' || $post['state'] == '209')))
 			{
+				echo "<pre>";
+				var_dump($post['state']);
+				var_dump($warehouse);
+				var_dump($thisdata['shop']);
+				var_dump($thisdata['number']);
+				var_dump($whlabel);
+				var_dump($fpdata);
+				die;
 			    $kcyz = $this->ck->get_kc($post['state'],$warehouse,$thisdata['shop'],$thisdata['number'],$whlabel,$fpdata);
 			    if($kcyz['t'] > '0')
 			    {
@@ -3045,7 +3053,12 @@ class Fullorder extends Start_Controller {
 								{
 									$ms = $ms[0];
 								}
-				        $ddh = substr($xg['orderinfo'],1);
+						if($xg['shop'] == 5){
+							$ddh = $xg['orderinfo'];
+						}else{
+							$ddh = substr($xg['orderinfo'],1);
+						}
+				       
 						$shopifyid = $xg['shopify'];
 				        //独立站地址更新订单状态、物流信息
 						$shopname = $shop['brandname'];  //店铺名

core/CoreApp/models/Model_api.php

@@ -726,7 +726,12 @@ function __construct(){
 		
 		if(in_array($shop['shopname'],['alipearlstore','finsahair','baddiebeautyshop','yolissahair']))
 		{
-			$url = 'https://'.$shop['shopname'].'.myshopify.com/admin/api/2022-10/orders/'.$shopifyid.'/fulfillment_orders.json';
+			if($shop['shopname'] == 'yolissahair'){
+				$shopname = 'xxu7p0-3q';
+			}else{
+				$shopname = $shop['shopname'];
+			}
+			$url = 'https://'.$shopname.'.myshopify.com/admin/api/2022-10/orders/'.$shopifyid.'/fulfillment_orders.json';
         	$headerA[] = "X-Shopify-Access-Token: ".$shop['token'];
         	$ch = curl_init();
         	curl_setopt($ch, CURLOPT_URL, $url);
@@ -746,7 +751,7 @@ function __construct(){
 			'line_items_by_fulfillment_order'=>$od));
 			$data = json_encode($data);
 			$this->logic_ding->sendToDing("erp同步独立站的信息tijiao".$data);
-			$url = 'https://'.$shop['shopname'].'.myshopify.com/admin/api/2022-10/fulfillments.json';
+			$url = 'https://'.$shopname.'.myshopify.com/admin/api/2022-10/fulfillments.json';
 			$header[] = "Content-Type: application/json";
         	$header[] = "X-Shopify-Access-Token: ".$shop['token'];
         	$ch = curl_init();