瀏覽代碼

提交数据

lvhao 1 月之前
父節點
當前提交
0c4cbd8c72
共有 2 個文件被更改,包括 17 次插入5 次删除
  1. 6 1
      core/CoreApp/controllers/Api.php
  2. 11 4
      core/CoreApp/models/Model_api.php

+ 6 - 1
core/CoreApp/controllers/Api.php

@@ -354,7 +354,12 @@ class Api extends Start_Controller {
 							}
 						}
 						$num = $this->fullorder->find_count('gtime = "'.date('Ymd',$time).'" and shop = "'.$value['id'].'"');
-						$order_id = $value['id'].$v['order_id'];
+						if($value['program'] == 'Shopify'){
+							$order_id = $v['order_id'];
+						}else{
+							$order_id = $value['id'].$v['order_id'];
+						}
+						
 						$tc = 0;
 						if(isset($v['global_currency_code']))
 						{

+ 11 - 4
core/CoreApp/models/Model_api.php

@@ -115,7 +115,7 @@ function __construct(){
 		if(in_array($name,['alipearlstore','finsahair','baddiebeautyshop','yolissahair','Yolissa']))
 		{
 			
-				$post['shopify'] = $shopapi.'?status=any&limit=100';//?status=any所有订单 &limit=200每页多少单
+				$post['shopify'] = $shopapi.'?status=any&limit=5';//?status=any所有订单 &limit=200每页多少单
 				$ch = curl_init();
 				curl_setopt($ch,CURLOPT_URL,'https://edm.alipearl.net/soapapi.php');
 				curl_setopt($ch, CURLOPT_POST, 1);
@@ -189,7 +189,7 @@ function __construct(){
 							}
 							else
 							{
-								$pay = $v['payment_gateway_names'][0];
+								$pay = isset($v['payment_gateway_names'][0])?$v['payment_gateway_names'][0]:"";
 							}
 						}
 						
@@ -300,8 +300,11 @@ function __construct(){
 						{
 							$authorid = $this->authorid($link,$shop['tweak']);
 						}
+						if(strpos($v['name'],"#M-") !== false){
+							continue;
+						}
 						$thatDayOrder[] = array(
-						'order_id' => $v['order_number'],//订单号
+						'order_id' => $v['name'],//订单号
 						'product_name' => $productNames,//产品标题
 						'purchased_on' => strtotime($created_at),//订单时间
 						'name' => $v['shipping_address']['name'],//收货人
@@ -840,7 +843,11 @@ function __construct(){
 		$post['type'] = 1;//发货仓库
 		$post['capital'] = 3;//资金支付状况,全部付款
 		$post['number'] = $shop['shortname'].'-'.substr(date('ymd',$time),1).'-'.(substr(strval($num+1+1000),1,3));//编号
-		$post['orderinfo'] = $shop['id'].$v['order_id'];//订单号
+		if($shop['program'] == 'Shopify'){
+			$post['orderinfo'] = $v['order_id'];//订单号
+		}else{
+			$post['orderinfo'] = $shop['id'].$v['order_id'];//订单号
+		}
 		$post['insurance'] = $v['insurance'];//运输保险费用
 		$post['baddress'] = $v['billing_address'];
 		$post['saddress'] = $v['shipping_address'];