|
@@ -225,7 +225,15 @@ class Model_notice extends Lin_Model
|
|
|
$list['quantity'] = (isset($list['quantity']))?(($list['quantity'] > '1')?$list['quantity'].' packages of':''):'';
|
|
|
$list['parameter'] = (isset($list['parameter']))?$list['parameter']:'';
|
|
|
$list['waybill'] = (isset($list['waybill']))?$list['waybill']:'';
|
|
|
- $ProductSKU = (isset($list['issku']))?$list['issku']:$list['sku'];
|
|
|
+ //$ProductSKU = (isset($list['issku']))?$list['issku']:$list['sku'];
|
|
|
+ $ProductSKU = "";
|
|
|
+ if(isset($list['issku'])){
|
|
|
+ $ProductSKU = $list['issku'];
|
|
|
+ }else{
|
|
|
+ if(isset($list['sku'])){
|
|
|
+ $ProductSKU = $list['sku'];
|
|
|
+ }
|
|
|
+ }
|
|
|
$yjtime = (isset($express['yjtime']))?$express['yjtime']:'';
|
|
|
$product = '';
|
|
|
if($list['product'] != '')
|
|
@@ -271,8 +279,16 @@ class Model_notice extends Lin_Model
|
|
|
}
|
|
|
}
|
|
|
//$this->logic_ding->sendToDing("监听同步平台信息".$list['orderinfo']."的product【".$list['product']."】以及对应的pt:【".json_encode($pt)."】最终生成的product".$product);
|
|
|
+ if(empty($data['fpdata'])){
|
|
|
+ $this->logic_ding->sendToDing("监听同步平台信息缺失fpdata".$list['orderinfo']."的传递的信息【".$list."】");
|
|
|
+ }
|
|
|
$ProductName = '';
|
|
|
- $st = explode(';',trim($list['fpdata'],';'));
|
|
|
+ if(empty($list['fpdata'])){
|
|
|
+ $st = [];
|
|
|
+ }else{
|
|
|
+ $st = explode(';',trim($list['fpdata'],';'));
|
|
|
+ }
|
|
|
+
|
|
|
foreach ($st as $v)
|
|
|
{
|
|
|
$v = explode('|',trim($v,'|'));
|