dever 5 سال پیش
والد
کامیت
1537351d19
3فایلهای تغییر یافته به همراه9 افزوده شده و 12 حذف شده
  1. 1 8
      app/collection/database/cate.php
  2. 5 2
      app/user/lib/Ticket.php
  3. 3 2
      app/user/src/Pay.php

+ 1 - 8
app/collection/database/cate.php

@@ -37,14 +37,7 @@ $pay_type = array
 
 $pay_channel = function()
 {
-    $array = array();
-    $info = Dever::load('pay/api.channel');
-    
-    if($info)
-    {
-        $array += $info;
-    }
-    return $array;
+    return Dever::load('pay/api.channel');
 };
 
 $id = Dever::input('where_id');

+ 5 - 2
app/user/lib/Ticket.php

@@ -7,7 +7,7 @@ use Dever;
 class Ticket
 {
     # 发起支付
-    public function action($parent_uid, $uid, $buy_id, $source = 'android', $type = false, $type_id = false)
+    public function action($parent_uid, $uid, $buy_id, $source)
     {
         if (!$uid) {
             Dever::alert('错误的用户信息');
@@ -21,9 +21,12 @@ class Ticket
         if (!$info) {
         	Dever::alert('购买失败');
         }
+        $cate = Dever::db('collection/cate')->one($info['cate_id']);
+        if (!$cate) {
+            Dever::alert('购买失败');
+        }
 
         $user = Dever::db('passport/user')->one($uid);
-        $wechat = Dever::db('passport/wechat')->one(array('uid' => $uid, 'type' => 1, 'system_id' => 1));
 
         if ($source == 'ios') {
             $method = 'app';

+ 3 - 2
app/user/src/Pay.php

@@ -18,6 +18,7 @@ class Pay extends Core
 
         $content_id = Dever::input('content_id');
         $goods_id = Dever::input('goods_id');
+        $address_id = Dever::input('address_id');
         $num = Dever::input('num');
         $sku = Dever::input('sku');
 
@@ -25,7 +26,7 @@ class Pay extends Core
             Dever::alert('请传入正确的产品ID');
         }
 
-        $pay = Dever::load('goods/lib/pay')->action($this->share_uid, $uid, $goods_id, $sku, $num, $this->source, 'collection/info', $this->id);
+        $pay = Dever::load('goods/lib/pay')->action($this->share_uid, $uid, $goods_id, $sku, $num, $address_id, $this->source, 'collection/info', $this->id);
 
         //return $pay;
 
@@ -54,7 +55,7 @@ class Pay extends Core
             Dever::alert('请选择正确的门票');
         }
 
-        $pay = Dever::load('user/lib/ticket')->action($this->share_uid, $uid, $buy_id, 'collection/info', $this->id);
+        $pay = Dever::load('user/lib/ticket')->action($this->share_uid, $uid, $buy_id, $this->source);
         print_r($pay);die;
 
         //return $pay;