Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into fix_goods

core/framework/function/http.php

@@ -85,7 +85,9 @@ function http_post_data($url, $body, $headers = array())
 
     curl_setopt($ci, CURLINFO_HEADER_OUT, TRUE);
     curl_setopt($ci, CURLOPT_URL, $url);
-    if ($headers) {
+    if (!empty($headers)) {
+        $val = implode(',',$headers);
+        Log::record("post oms header={$val}",Log::DEBUG);
         curl_setopt($ci, CURLOPT_HTTPHEADER, $headers);
     }
 

data/logic/delivery.logic.php

@@ -37,6 +37,8 @@ class deliveryLogic
         {
             if ($order_info['order_state'] === '20')
             {
+                $nick_name = $order_info['reciver_name'];
+
                 $delivery_order = array();
                 $delivery_order['tid'] = $order_info['order_sn'];
                 $delivery_order['total_fee'] = $order_info['order_amount'];
@@ -49,7 +51,7 @@ class deliveryLogic
                 $delivery_order['pay_account_type'] = $order_info['payment_code'] == 'wxpay' ? '微信支付': '支付宝';
                 $delivery_order['pay_account_id'] = '';
                 $delivery_order['pay_account_no'] = $trade_no;
-                $delivery_order['buyer_nick'] = $order_info['buyer_name'] === 'anonymous' ? 'anonymous'.'_'. $order_info['buyer_id'] : $order_info['buyer_name'];
+                $delivery_order['buyer_nick'] = $nick_name;//$order_info['buyer_name'] === 'anonymous' ? 'anonymous'.'_'. $order_info['buyer_id'] : $order_info['buyer_name'];
                 $delivery_order['buyer_email'] = $order_info['buyer_email'];
                 $delivery_order['trade_memo'] = '';
                 $delivery_order['receiver_name'] = $order_info['reciver_name'];
@@ -66,6 +68,8 @@ class deliveryLogic
                 $delivery_order['receiver_mobile'] = $order_info['reciver_info']['mob_phone'];
                 $delivery_order['receiver_phone'] = $order_info['reciver_info']['tel_phone'];
                 $delivery_order['order_size'] = count($order_info['extend_order_goods']);
+
+
                 $delivery_order['orderList'] = array();
 
                 foreach($order_info['extend_order_goods'] as $key => $goods)
@@ -79,7 +83,7 @@ class deliveryLogic
                     $goods_serial = Model('goods')->cls()->getGoodsInfo(array('goods_id'=>$goods['goods_id']));
                     $delivery_goods['outer_sku_id'] = $goods_serial['goods_serial'];
                     $delivery_goods['outer_sku_properties_name'] = $goods['goods_name'];
-                    $delivery_goods['buyer_nick'] = $order_info['reciver_name'];//$order_info['buyer_name'] === 'anonymous' ? 'anonymous'.'_'. $order_info['buyer_id'] : $order_info['buyer_name'];
+                    $delivery_goods['buyer_nick'] = $nick_name; //$order_info['reciver_name'];//$order_info['buyer_name'] === 'anonymous' ? 'anonymous'.'_'. $order_info['buyer_id'] : $order_info['buyer_name'];
                     array_push($delivery_order['orderList'] , $delivery_goods);
                 }
                 array_push($delivery_order_list, $delivery_order);
@@ -89,6 +93,22 @@ class deliveryLogic
         $sign = $this->_getSign($data);
         $headers = array('v_appkey: '.self::$appkey, 'v_sign: '.$sign, 'Content-Type: application/json');
         $result = http_post_data(self::$appURL,json_encode($data),$headers);
+
+        if(!empty($result) && is_array($result))
+        {
+            if($result['apiCode'] == 'success')
+            {
+                if(!empty($result['data']) && is_array($result['data']) && count($result['data']) > 0)
+                {
+                    if(empty($result['data'][0]['status']) || $result['data'][0]['status'] != 1) {
+                        Log::record("PUSHOMS ERR pay_sn=> $pay_sn",Log::ERR);
+                    } else {
+                        Log::record("PUSHOMS SUCCESS pay_sn=> $pay_sn",Log::DEBUG);
+                    }
+                }
+            }
+        }
+
         Log::record("post data={$result}",Log::DEBUG);
         return $result;
     }