stanley-king 9 سال پیش
والد
کامیت
9d870c6ed2
2فایلهای تغییر یافته به همراه7 افزوده شده و 7 حذف شده
  1. 1 6
      data/logic/delivery.logic.php
  2. 6 1
      mobile/alipay_notify_url.php

+ 1 - 6
data/logic/delivery.logic.php

@@ -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'];

+ 6 - 1
mobile/alipay_notify_url.php

@@ -1,13 +1,15 @@
 <?php
 
 define('ALIPAY_PATH', BASE_MOBILE_PATH . '/api/payment/alipay');
+
 require_once(ALIPAY_PATH . '/alipay.config.php');
 require_once(ALIPAY_PATH . '/lib/alipay_notify.class.php');
 require_once(BASE_MOBILE_PATH . '/control/app_pay.php');
-
+require_once (BASE_DATA_PATH . '/logic/delivery.logic.php');
 
 $out_trade_no = $_POST['out_trade_no'];  // 商户订单号
 $trade_no = $_POST['trade_no'];          // 支付宝交易号
+
 Log::record("alipay_notify_url: out_trade_no={$out_trade_no}", Log::DEBUG);
 
 // 步骤一:验证数据来源正确性
@@ -30,6 +32,9 @@ if ($verify_result)
             Log::record("update_order fail: out_trade_no={$out_trade_no}", Log::DEBUG);
             echo('fail');
         } else {
+            $logic_delivery = Logic('delivery');
+            $ret = $logic_delivery->putOrder($out_trade_no, $transaction_id);
+
             Log::record("update_order success: out_trade_no={$out_trade_no}", Log::DEBUG);
             echo('success');
         }