Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

application/api/controller/Examine.php

@@ -35,8 +35,9 @@ class Examine extends Api
             ->order('weigh desc,id desc')
             ->autopage()
             ->select();
+        $list = json_decode(json_encode($list),true);
         foreach ($list as $k => $v) {
-            $list[$k]['apply'] = !empty($v['apply']) ? 1 : 0;
+            $list[$k]['apply'] = (!empty($v['apply']) ? 1 : 0);
         }
         return $this->success('success', $list);
     }

application/api/controller/Hotel.php

@@ -178,7 +178,7 @@ class Hotel extends Api
                 $query->where('start_date','>',date('Y-m-d'))->where('status',1);
                 break;
             case 2:
-                $query->where('start_date','<',date('Y-m-d'))->where('status',1);
+                $query->where('start_date','<=',date('Y-m-d'))->where('status',1);
                 break;
             case 3:
                 $query->where('status',0);
@@ -212,8 +212,11 @@ class Hotel extends Api
         $user_id = $this->auth->id;
 
         $query = HotelOrderModel::with([
-            'room'=>function ($query) {
+            'hotel' => function ($query) {
                 $query->field(['id','name','image']);
+            },
+            'room'=>function ($query) {
+                $query->field(['id','name','image','space','floor','is_wifi','window','breakfast','people_num','bad']);
             }
         ])->where('id',$params['id'])->where('user_id',$user_id);
 

application/api/controller/UniversityCourse.php

@@ -36,6 +36,7 @@ class UniversityCourse extends Api
             ->order('weigh desc,id desc')
             ->autopage()
             ->select();
+        $list = json_decode(json_encode($list),true);
         foreach ($list as $k => $v) {
             $list[$k]['apply'] = !empty($v['apply']) ? 1 : 0;
         }
@@ -52,6 +53,7 @@ class UniversityCourse extends Api
         $user_id = $this->auth->id;
 
         $info = UniversityCourseModel::with([
+            'chapter',
             'apply' => function ($query) use ($user_id) {
                 $query->field('id,course_id,user_id')->where('user_id', $user_id)->where('status', 1);
             }
@@ -77,6 +79,9 @@ class UniversityCourse extends Api
         if (empty($params['phone'])) {
             return $this->error('报名信息手机号不能为空');
         }
+        if (empty($params['course_id'])) {
+            return $this->error('请选择抵扣券');
+        }
         $user_id = $this->auth->id;
 
         $info = UniversityCourseModel::with([

application/api/controller/UniversityEvent.php

@@ -34,6 +34,7 @@ class UniversityEvent extends Api
             ->order('id desc')
             ->autopage()
             ->select();
+        $list = json_decode(json_encode($list),true);
         foreach ($list as $k => $v) {
             $list[$k]['start_apply_time'] = date('Y-m-d H:i', $v['start_apply_time']);
             $list[$k]['end_apply_time']   = date('Y-m-d H:i', $v['end_apply_time']);

application/common/model/HotelOrderModel.php

@@ -33,6 +33,11 @@ class HotelOrderModel extends Model
         return $value;
     }
 
+    public function hotel()
+    {
+        return $this->hasOne(HotelModel::class, 'id', 'hotel_id');
+    }
+
     public function room()
     {
         return $this->hasOne(HotelRoomModel::class, 'id', 'room_id');

application/common/model/UniversityCourseChapterModel.php

@@ -19,6 +19,11 @@ class UniversityCourseChapterModel extends Model
     protected $updateTime = false;
     protected $deleteTime = false;
 
+    public function getVideoAttr($value, $data)
+    {
+        return cdnurl($value);
+    }
+
     public function course()
     {
         return $this->hasOne(UniversityCourseModel::class, 'id', 'course_id');

application/common/model/UniversityCourseModel.php

@@ -33,6 +33,11 @@ class UniversityCourseModel extends Model
         return $value;
     }
 
+    public function chapter()
+    {
+        return $this->hasMany(UniversityCourseChapterModel::class, 'course_id', 'id');
+    }
+
     public function apply()
     {
         return $this->hasOne(UniversityCourseApplyModel::class, 'course_id', 'id');