|
|
@@ -1494,7 +1494,7 @@ class Fullorder extends Start_Controller {
|
|
|
$shop = $this->shop->read($fullorder['shop']);
|
|
|
$this->data['et'] = $shop['estimaterate'];//此店铺配置预计到帐金额比例
|
|
|
$is = 0;
|
|
|
- if($shop['type'] == 269)//判断是否独立站，269是独立站
|
|
|
+ if($shop['type'] == 269 || $shop['type'] == 2768)//判断是否独立站，269是独立站
|
|
|
{
|
|
|
$is = 1;
|
|
|
}
|
|
|
@@ -2046,7 +2046,7 @@ class Fullorder extends Start_Controller {
|
|
|
$shop = $this->shop->read($fullorder['shop']);
|
|
|
$this->data['et'] = $shop['estimaterate'];//此店铺配置预计到帐金额比例
|
|
|
$is = 0;
|
|
|
- if($shop['type'] == 269)//判断是否独立站，269是独立站
|
|
|
+ if($shop['type'] == 269 || $shop['type']==2768 )//判断是否独立站，269是独立站
|
|
|
{
|
|
|
$is = 1;
|
|
|
}
|
|
|
@@ -3072,7 +3072,7 @@ class Fullorder extends Start_Controller {
|
|
|
$t= array('%buyername%','%email_call%','%track_type%','%service%','%track_link%','%logistics_number%','%shop%','%phone%','%jtime%');
|
|
|
$h= array($buyername,$email_call,$track_type,$service,$track_link,$logistics_number,$shopname,$phone,$ex['yjtime']);
|
|
|
$remark = str_replace($t,$h,$ms['content']);
|
|
|
- @$gx = $this->api->get_gx($ddh,$msg,$xg,$shop,$ex,$remark,$shopifyid);
|
|
|
+ $gx = $this->api->get_gx($ddh,$msg,$xg,$shop,$ex,$remark,$shopifyid);
|
|
|
}
|
|
|
else if($xg['source'] == 1)
|
|
|
{
|
|
|
@@ -6192,7 +6192,7 @@ class Fullorder extends Start_Controller {
|
|
|
$shop = $this->shop->read($fullorder['shop']);
|
|
|
$this->data['et'] = $shop['estimaterate'];//此店铺配置预计到帐金额比例
|
|
|
$is = 0;
|
|
|
- if($shop['type'] == 269)//判断是否独立站，269是独立站
|
|
|
+ if($shop['type'] == 269 || $shop['type'] == 2678)//判断是否独立站，269是独立站
|
|
|
{
|
|
|
$is = 1;
|
|
|
}
|
