增加我的订单详情

application/api/controller/Index.php

@@ -80,7 +80,7 @@ class Index extends Api
         $info['signupendtime'] = date('Y-m-d H:i', $info['signupendtime']);
         $info['refundendtime'] = date('Y-m-d H:i', $info['refundendtime']);
         //查询已报名列表
-        $active_people = Db::name('active_people')->where(['active_id' => $id])->field('user_id, name, createtime')->select();
+        $active_people = Db::name('active_people')->where(['active_id' => $id, 'status' => ['neq', 3]])->field('user_id, name, createtime')->select();
         $user = Db::name('user');
         foreach ($active_people as &$v) {
             $v['avatar'] = $user->where(['id' => $v['user_id']])->value('avatar');
@@ -90,7 +90,7 @@ class Index extends Api
         $info['active_people'] = $active_people;
         $info['customer_service'] = config('site.customer_service') ? config('site.customer_service') : ''; //客服电话
 
-        $this->success('招标详情', $info);
+        $this->success('活动详情', $info);
     }
 
     //报名活动之前检查
@@ -207,7 +207,7 @@ class Index extends Api
         foreach ($active_people_arr as $k => &$v) {
             $data = [];
             //判断是否报名过
-            $count = $active_people->where(['active_id' => $id, 'idcard' => $v['idcard']])->count('id');
+            $count = $active_people->where(['active_id' => $id, 'idcard' => $v['idcard'], 'status' => ['neq', 3]])->count('id');
             if ($count) {
                 $this->error($v['name'] . $v['idcard'] . '已报名过该活动');
                 break;
@@ -252,7 +252,7 @@ class Index extends Api
                     }
                     //检查当月是否用过免费次数
                     $month_time = strtotime(date('Y-m-1', time()));
-                    $count = Db::name('active_people')->where(['user_id' => $this->auth->id, 'is_free' => 1, 'createtime' => ['egt', $month_time]])->count('id');
+                    $count = $active_people->where(['user_id' => $this->auth->id, 'is_free' => 1, 'createtime' => ['egt', $month_time]])->count('id');
                     if ($count) {
                         $this->error('您当月已使用过免费次数');
                         break;
@@ -469,7 +469,7 @@ class Index extends Api
         //开始事务
         Db::startTrans();
         //修改活动表数据
-        $active_rs = Db::name('active')->where(['id' => $id, 'currentperson' => $info['currentperson']])->setField('currentperson', $info['currentperson'] + count($active_people));
+        $active_rs = Db::name('active')->where(['id' => $id, 'currentperson' => $info['currentperson']])->setField('currentperson', $info['currentperson'] + count($active_people_arr));
         if (!$active_rs) {
             Db::rollback();
             $this->error('网络延迟，请稍后再试');
@@ -483,6 +483,7 @@ class Index extends Api
         //添加人员信息
         foreach ($_data as &$v) {
             $v['order_id'] = $rs;
+            $v['status'] = $order_data['status'];
             $rt = $active_people->insertGetId($v);
             if (!$rt) {
                 Db::rollback();

application/api/controller/User.php

@@ -1643,29 +1643,28 @@ class User extends Api
             $this->error('参数缺失');
         }
 
-        $info = Db::name('active_order')->find($id);
+        $info = Db::name('active_order')->where(['id' => $id, 'user_id' => $this->auth->id])->find();
         if (!$info) {
             $this->error('数据不存在');
         }
 
-        $info = info_domain_image($info, ['image']);
-        $info['starttime'] = date('Y-m-d H:i', $info['starttime']);
-        $info['endtime'] = date('Y-m-d H:i', $info['endtime']);
-        $info['collectiontime'] = date('Y-m-d H:i', $info['collectiontime']);
-        $info['signupendtime'] = date('Y-m-d H:i', $info['signupendtime']);
-        $info['refundendtime'] = date('Y-m-d H:i', $info['refundendtime']);
-        //查询已报名列表
-        $active_people = Db::name('active_people')->where(['active_id' => $id])->field('user_id, name, createtime')->select();
-        $user = Db::name('user');
-        foreach ($active_people as &$v) {
-            $v['avatar'] = $user->where(['id' => $v['user_id']])->value('avatar');
-            $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
-        }
+        $info['createtime'] = date('Y-m-d H:i:s', $info['createtime']);
+        //查询活动信息
+        $active = Db::name('active')->find($info['active_id']);
+        $active = info_domain_image($active, ['image']);
+        $active['starttime'] = date('Y-m-d H:i', $active['starttime']);
+        $active['endtime'] = date('Y-m-d H:i', $active['endtime']);
+        $active['collectiontime'] = date('Y-m-d H:i', $active['collectiontime']);
+        $active['signupendtime'] = date('Y-m-d H:i', $active['signupendtime']);
+        $active['refundendtime'] = date('Y-m-d H:i', $active['refundendtime']);
+
+        //查询报名人员
+        $active_people = Db::name('active_people')->where(['order_id' => $id])->field('id, name, mobile')->select();
 
+        $info['active'] = $active;
         $info['active_people'] = $active_people;
-        $info['customer_service'] = config('site.customer_service') ? config('site.customer_service') : ''; //客服电话
 
-        $this->success('招标详情', $info);
+        $this->success('我的订单详情', $info);
     }
 
 }