配套列表

application/api/controller/Usercenter.php

@@ -15,19 +15,23 @@ class Usercenter extends Api
 
     //我的配套
     public function my_package(){
+        $user_status = input('user_status',1); //默认已启用
+
         $map = [
             'order.user_id' => $this->auth->id,
             'order.order_status' => 1,
             //'order.remain' => ['gt',0],
             'order.is_gift' => 0,
+            'order.use_status' => $user_status,
         ];
         $list = Db::name('package_order')->alias('order')
-            ->field('order.id,order.starttime,order.endtime,order.is_gift,order.remain,p.name,p.name_en')
+            ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,p.name,p.name_en,p.image')
             ->join('lesson_package p','order.package_id = p.id','LEFT')
             ->where($map)->order('order.remain desc,order.endtime asc')
             ->autopage()->select();
 
         $list = $this->list_lang($list,['name']);
+        $list = list_domain_image($list,['image']);
 
         if(!empty($list)){
             foreach($list as $key => &$val){
@@ -55,13 +59,13 @@ class Usercenter extends Api
             'order.is_gift' => 1,
         ];
         $list = Db::name('package_order')->alias('order')
-            ->field('order.id,order.order_no,order.starttime,order.endtime,order.is_gift,order.sessions,order.remain,
+            ->field('order.id,order.order_no,order.starttime,order.endtime,order.days,order.is_gift,order.sessions,order.remain,order.use_status,
             p.name as package_name,p.name_en as package_name_en')
             ->join('lesson_package p','order.package_id = p.id','LEFT')
             ->where($map)->order('order.remain desc,order.endtime asc')
             ->autopage()->select();
 
-        $list = $this->list_lang($list,['name','package_name']);
+        $list = $this->list_lang($list,['package_name']);
 
         foreach($list as $key => &$order){
             //转换remain
@@ -546,6 +550,15 @@ class Usercenter extends Api
 
         $data = request_post_hub($field);
 
+        //检查被装让套餐
+        $package = Db::name('package_order')->where('order_status',1)->where('user_id',$this->auth->id)->where('id',$data['package_order_id'])->find();
+        if(empty($package)){
+            $this->error('不存在的套餐订单');
+        }
+        if($package['use_status'] != 1){
+            $this->error('该配套还没有激活');
+        }
+
         $data['user_id'] = $this->auth->id;
         $data['createtime'] = time();