dever 4 سال پیش
والد
کامیت
a33453d783
3فایلهای تغییر یافته به همراه29 افزوده شده و 28 حذف شده
  1. 2 2
      app/user/database/seat_order.php
  2. 2 2
      app/user/database/ticket_order.php
  3. 25 24
      app/user/lib/Manage.php

+ 2 - 2
app/user/database/seat_order.php

@@ -252,7 +252,7 @@ return array
             'search'    => 'select',
             'update'    => 'radio',
             'list'      => true,
-            'list'      => 'Dever::load("user/lib/manage.showOrderStatus", "{id}")',
+            'list'      => 'Dever::load("user/lib/manage.showOrderStatus", "{id}", "seat")',
             'control'   => 'status',
         ),
 
@@ -394,7 +394,7 @@ return array
         ),
 
         'list_button' => array(
-            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2 && ({type} == 1 || {type} == 3)'),
+            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2'),
             //'delete' => array('删除', '', '{status} == 1'),
         ),
     ),

+ 2 - 2
app/user/database/ticket_order.php

@@ -218,7 +218,7 @@ return array
             'search'    => 'select',
             'update'    => 'radio',
             'list'      => true,
-            'list'      => 'Dever::load("user/lib/manage.showOrderStatus", "{id}")',
+            'list'      => 'Dever::load("user/lib/manage.showOrderStatus", "{id}", "ticket")',
             'control'   => 'status',
         ),
 
@@ -360,7 +360,7 @@ return array
         ),
 
         'list_button' => array(
-            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2 && ({type} == 1 || {type} == 3)'),
+            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2'),
             //'delete' => array('删除', '', '{status} == 1'),
         ),
     ),

+ 25 - 24
app/user/lib/Manage.php

@@ -24,9 +24,9 @@ class Manage
         return Dever::table($table);
     }
 
-	public function showOrderUser($id)
+    public function showOrderUser($id)
     {
-        $info = Dever::db('coll/order')->one($id);
+        $info = Dever::db('user/ticket_order')->one($id);
 
         $table = array();
 
@@ -35,38 +35,39 @@ class Manage
         $table['用户名'] = $user['username'] . '('.$info['uid'].')';
         $table['手机号'] = $user['mobile'];
         $table['产品名'] = $info['name'];
-        if ($info['type'] == 1) {
-            $table['支付方式'] = '购买小刊';
-            $table['支付金额'] = $info['cash'];
-        } elseif ($info['type'] == 3) {
-            $table['支付方式'] = '购买小刊兑换码';
-            $table['兑换码'] = $info['code'];
-            $table['支付金额'] = $info['cash'];
-        } elseif ($info['type'] == 2) {
-            $table['支付方式'] = '兑换小刊';
-            $table['兑换码'] = $info['code'];
-        } elseif ($info['type'] == 4) {
-            $table['支付方式'] = '使用通用兑换码';
-            $table['兑换码'] = $info['code'];
-        }
         //$table['购买数量'] = $info['num'];
         
-        if ($info['source_uid'] && $info['source_uid'] != $info['uid']) {
-            $user = Dever::db('passport/user')->one($info['source_uid']);
+        if ($info['parent_uid'] && $info['parent_uid'] != $info['uid']) {
+            $user = Dever::db('passport/user')->one($info['parent_uid']);
             $table['邀请人'] = $user['username'];
         }
 
-        if ($info['star_id']) {
-            $star = Dever::db('journal/star')->one($info['star_id']);
-            $table['明星'] = $star['name'];
-        }
+        return Dever::table($table);
+    }
 
+	public function showSeatOrderUser($id)
+    {
+        $info = Dever::db('user/seat_order')->one($id);
+
+        $table = array();
+
+        $user = Dever::db('passport/user')->one($info['uid']);
+
+        $table['用户名'] = $user['username'] . '('.$info['uid'].')';
+        $table['手机号'] = $user['mobile'];
+        $table['产品名'] = $info['name'];
+        //$table['购买数量'] = $info['num'];
+        
+        if ($info['parent_uid'] && $info['parent_uid'] != $info['uid']) {
+            $user = Dever::db('passport/user')->one($info['parent_uid']);
+            $table['邀请人'] = $user['username'];
+        }
         return Dever::table($table);
     }
 
-    public function showOrderStatus($id)
+    public function showOrderStatus($id, $type)
     {
-        $info = Dever::db('act/order')->one($id);
+        $info = Dever::db('user/'.$type.'_order')->one($id);
         if ($info) {
             if ($info['status'] == 1) {
                 #return '*已支付';