|
@@ -303,6 +303,7 @@ class Lesson extends Api
|
|
|
'o.endtime' => ['gt',time()],
|
|
|
'o.remain' => ['egt',$number_hours], //不能只是大于0,还得大于等于报名人数
|
|
|
'o.order_status' => 1,
|
|
|
+// 'o.use_status' => 1, //已激活的
|
|
|
];
|
|
|
$package_list = Db::name('package_order')->alias('o')
|
|
|
->join('lesson_package p','o.package_id = p.id','LEFT')
|
|
@@ -433,6 +434,7 @@ class Lesson extends Api
|
|
|
'endtime' => ['gt',time()],
|
|
|
'remain' => ['gt',0],
|
|
|
'order_status' => 1,
|
|
|
+// 'use_status' => 1, //已激活的
|
|
|
'id' => $packageorder_id,
|
|
|
];
|
|
|
$package_order = Db::name('package_order')->where($map)->where('find_in_set(:lesson_ids,lesson_ids)', ['lesson_ids' => $info['lesson_id']])->lock(true)->find();
|
|
@@ -446,6 +448,10 @@ class Lesson extends Api
|
|
|
Db::rollback();
|
|
|
$this->error('该套餐余额不足,可以使用其他支付方式');
|
|
|
}
|
|
|
+ if($package_order['use_status'] != 1){
|
|
|
+ Db::rollback();
|
|
|
+ $this->error('该套餐尚未激活');
|
|
|
+ }
|
|
|
|
|
|
//扣除一节
|
|
|
$update = [
|