套餐对应课程，1对多

application/api/controller/Lesson.php

@@ -156,7 +156,7 @@ class Lesson extends Api
         //此课程是否还有未使用的套餐(多个包含赠送的)
         $map = [
             'o.user_id' =>$this->auth->id,
-            'o.lesson_id' => $info['lesson_id'],
+//            'o.lesson_id' => $info['lesson_id'],
             'o.endtime' => ['gt',time()],
             'o.remain' => ['egt',$number], //不能只是大于0，还得大于等于报名人数
             'o.order_status' => 1,
@@ -164,7 +164,9 @@ class Lesson extends Api
         $package_list = Db::name('package_order')->alias('o')
             ->join('lesson_package p','o.package_id = p.id','LEFT')
             ->field('o.id,o.remain,o.starttime,o.endtime,o.is_gift,p.name,p.name_en')
-            ->where($map)->order('o.endtime asc')->select();
+            ->where($map)
+            ->where('find_in_set(:lesson_ids,o.lesson_ids)', ['lesson_ids' => $info['lesson_id']])
+            ->order('o.endtime asc')->select();
         $package_list = $this->list_lang($package_list,['name']);
         if(!empty($package_list)){
             foreach($package_list as $key => &$val){
@@ -367,12 +369,10 @@ class Lesson extends Api
         $lesson_id = input('lesson_id',0);
 
         //套餐列表
-        $list = Db::name('lesson_package')->alias('p')
-            ->field('p.*,e.image')
-            ->join('lesson e','p.lesson_id = e.id','LEFT')
-            ->where('p.lesson_id',$lesson_id)
-            ->where('p.is_show',1)
-            ->order('p.weigh desc')->select();
+        $list = Db::name('lesson_package')
+            ->where('find_in_set(:lesson_ids,lesson_ids)', ['lesson_ids' => $lesson_id])
+            ->where('is_show',1)
+            ->order('weigh desc')->select();
         $list = list_domain_image($list,['image']);
         $list = $this->list_lang($list,['name','validity','activeremark']);
 
@@ -384,13 +384,11 @@ class Lesson extends Api
         $package_id = input('package_id',0);
 
         //套餐详情
-        $list = Db::name('lesson_package')->alias('p')
-            ->field('p.*,e.image')
-            ->join('lesson e','p.lesson_id = e.id','LEFT')
-            ->where('p.id',$package_id)
-            ->order('p.weigh desc')->find();
+        $list = Db::name('lesson_package')
+            ->where('id',$package_id)
+            ->order('weigh desc')->find();
         $list = info_domain_image($list,['image']);
-        $list = $this->info_lang($list,['name','validity','activeremark']);
+        $list = $this->info_lang($list,['name','validity','activeremark','content']);
 
         $this->success(1,$list);
     }
@@ -407,7 +405,7 @@ class Lesson extends Api
             'order_no'    => createUniqueNo('P',$this->auth->id),
             'user_id'     => $this->auth->id,
             'package_id'  => $package_id,
-            'lesson_id'   => $package_info['lesson_id'],
+            'lesson_id'   => $package_info['lesson_id'],////////////错误
             'sessions'    => $package_info['sessions'],
             'starttime'   => time(),
             'days'        => $package_info['days'],