|
@@ -26,17 +26,12 @@ class deliveryLogic
|
|
|
|
|
|
public function putOrder($pay_sn, $trade_no)
|
|
|
{
|
|
|
- Log::record(__FUNCTION__,Log::DEBUG);
|
|
|
-
|
|
|
$order_list = Model('order')->getNormalOrderList(array('pay_sn'=> $pay_sn), $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
|
|
|
$delivery_order_list = array();
|
|
|
foreach ($order_list as $order_info)
|
|
|
{
|
|
|
- Log::record(" 1 ",Log::DEBUG);
|
|
|
-
|
|
|
if ($order_info['order_state'] === '20')
|
|
|
{
|
|
|
- Log::record(" 2 ",Log::DEBUG);
|
|
|
$delivery_order = array();
|
|
|
$delivery_order['tid'] = $order_info['order_sn'];
|
|
|
$delivery_order['total_fee'] = $order_info['order_amount'];
|
|
@@ -76,7 +71,7 @@ class deliveryLogic
|
|
|
$delivery_goods['title'] = $goods['goods_name'];
|
|
|
$delivery_goods['price'] = $goods['goods_price'];
|
|
|
$delivery_goods['num'] = $goods['goods_num'];
|
|
|
- $goods_serial = Model('goods')->getGoodsInfo(array('goods_id'=>$goods['goods_id']));
|
|
|
+ $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['buyer_name'] === 'anonymous' ? 'anonymous'.'_'. $order_info['buyer_id'] : $order_info['buyer_name'];
|