mirror of
https://gitee.com/koogua/course-tencent-cloud.git
synced 2025-07-29 19:30:40 +08:00
Compare commits
No commits in common. "master" and "v1.7.8" have entirely different histories.
@ -251,16 +251,14 @@ class ChapterContent extends Service
|
||||
|
||||
$content = $validator->checkContent($post['content']);
|
||||
|
||||
$read->content = $content;
|
||||
|
||||
$read->update();
|
||||
$read->update(['content' => $content]);
|
||||
|
||||
$attrs = $chapter->attrs;
|
||||
|
||||
$attrs['word_count'] = WordUtil::getWordCount($content);
|
||||
$attrs['duration'] = WordUtil::getWordDuration($content);
|
||||
$chapter->attrs = $attrs;
|
||||
|
||||
$chapter->update();
|
||||
$chapter->update(['attrs' => $attrs]);
|
||||
|
||||
$this->updateCourseReadAttrs($read->course_id);
|
||||
}
|
||||
|
@ -11,11 +11,9 @@
|
||||
积分兑换
|
||||
{% elseif value == 6 %}
|
||||
抽奖兑换
|
||||
{% elseif value == 7 %}
|
||||
教师
|
||||
{% elseif value == 10 %}
|
||||
试听
|
||||
{% else %}
|
||||
N/A
|
||||
{% endif %}
|
||||
{%- endmacro %}
|
||||
{%- endmacro %}
|
@ -11,11 +11,5 @@
|
||||
积分
|
||||
{% elseif value == 6 %}
|
||||
抽奖
|
||||
{% elseif value == 7 %}
|
||||
教师
|
||||
{% elseif value == 10 %}
|
||||
试听
|
||||
{% else %}
|
||||
N/A
|
||||
{% endif %}
|
||||
{%- endmacro %}
|
||||
{%- endmacro %}
|
@ -19,7 +19,6 @@ class CourseUser extends Model
|
||||
const SOURCE_MANUAL = 4; // 分配
|
||||
const SOURCE_POINT_REDEEM = 5; // 积分兑换
|
||||
const SOURCE_LUCKY_REDEEM = 6; // 抽奖兑换
|
||||
const SOURCE_TEACHER = 7; // 教师
|
||||
const SOURCE_TRIAL = 10; // 试听
|
||||
|
||||
/**
|
||||
@ -138,7 +137,6 @@ class CourseUser extends Model
|
||||
self::SOURCE_TRIAL => '试听',
|
||||
self::SOURCE_VIP => '畅学',
|
||||
self::SOURCE_MANUAL => '分配',
|
||||
self::SOURCE_TEACHER => '教师',
|
||||
self::SOURCE_POINT_REDEEM => '积分兑换',
|
||||
self::SOURCE_LUCKY_REDEEM => '抽奖兑换',
|
||||
];
|
||||
|
@ -46,11 +46,7 @@ trait CourseUserTrait
|
||||
$this->joinedCourse = true;
|
||||
}
|
||||
|
||||
if ($course->teacher_id == $user->id) {
|
||||
|
||||
$this->ownedCourse = true;
|
||||
|
||||
} elseif ($course->market_price == 0) {
|
||||
if ($course->market_price == 0) {
|
||||
|
||||
$this->ownedCourse = true;
|
||||
|
||||
@ -100,7 +96,6 @@ trait CourseUserTrait
|
||||
case CourseUserModel::SOURCE_FREE:
|
||||
case CourseUserModel::SOURCE_TRIAL:
|
||||
case CourseUserModel::SOURCE_VIP:
|
||||
case CourseUserModel::SOURCE_TEACHER:
|
||||
$this->createCourseUser($course, $user, $expiryTime, $sourceType);
|
||||
$this->deleteCourseUser($relation);
|
||||
break;
|
||||
@ -174,8 +169,6 @@ trait CourseUserTrait
|
||||
$result = true;
|
||||
} elseif ($course->vip_price == 0 && $user->vip == 1) {
|
||||
$result = true;
|
||||
} elseif($course->teacher_id == $user->id) {
|
||||
$result = true;
|
||||
}
|
||||
|
||||
return $result;
|
||||
@ -183,10 +176,6 @@ trait CourseUserTrait
|
||||
|
||||
protected function getFreeSourceType(CourseModel $course, UserModel $user)
|
||||
{
|
||||
if ($course->teacher_id == $user->id) {
|
||||
return CourseUserModel::SOURCE_TEACHER;
|
||||
}
|
||||
|
||||
$sourceType = CourseUserModel::SOURCE_FREE;
|
||||
|
||||
if ($course->market_price > 0) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user