{% if contact_info.enabled == 1 %}
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index 72dc5be5..1ead1181 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -16,7 +16,7 @@ class AppInfo
protected $link = 'https://koogua.com';
- protected $version = '1.5.3';
+ protected $version = '1.5.4';
public function __get($name)
{
diff --git a/app/Models/PointGift.php b/app/Models/PointGift.php
index 7efcce29..ae424730 100644
--- a/app/Models/PointGift.php
+++ b/app/Models/PointGift.php
@@ -19,6 +19,7 @@ class PointGift extends Model
*/
const TYPE_COURSE = 1; // 课程
const TYPE_GOODS = 2; // 商品
+ const TYPE_VIP = 3; // 会员
/**
* 课程扩展属性
@@ -31,6 +32,17 @@ class PointGift extends Model
'price' => 0,
];
+ /**
+ * 会员扩展属性
+ *
+ * @var array
+ */
+ protected $_vip_attrs = [
+ 'id' => 0,
+ 'title' => '',
+ 'price' => 0,
+ ];
+
/**
* 商品扩展属性
*
@@ -162,6 +174,8 @@ class PointGift extends Model
if (empty($this->attrs)) {
if ($this->type == self::TYPE_COURSE) {
$this->attrs = $this->_course_attrs;
+ } elseif ($this->type == self::TYPE_VIP) {
+ $this->attrs = $this->_vip_attrs;
} elseif ($this->type == self::TYPE_GOODS) {
$this->attrs = $this->_goods_attrs;
}
@@ -224,6 +238,7 @@ class PointGift extends Model
return [
self::TYPE_COURSE => '课程',
self::TYPE_GOODS => '商品',
+ self::TYPE_VIP => '会员',
];
}
diff --git a/app/Repos/CourseUser.php b/app/Repos/CourseUser.php
index 36b1c38f..3afa19bf 100644
--- a/app/Repos/CourseUser.php
+++ b/app/Repos/CourseUser.php
@@ -163,4 +163,17 @@ class CourseUser extends Repository
->execute();
}
+ /**
+ * @param int $courseId
+ * @param int $userId
+ * @return ResultsetInterface|Resultset|CourseUserModel[]
+ */
+ public function findByCourseAndUserId($courseId, $userId)
+ {
+ return CourseUserModel::query()
+ ->where('course_id = :course_id:', ['course_id' => $courseId])
+ ->andWhere('user_id = :user_id:', ['user_id' => $userId])
+ ->execute();
+ }
+
}
diff --git a/app/Repos/PointGift.php b/app/Repos/PointGift.php
index ba078a52..91669d01 100644
--- a/app/Repos/PointGift.php
+++ b/app/Repos/PointGift.php
@@ -77,10 +77,11 @@ class PointGift extends Repository
}
/**
- * @param int $courseId
+ * @param int $itemId
+ * @param int $itemType
* @return PointGiftModel|Model|bool
*/
- public function findByCourseId($courseId)
+ public function findItemGift($itemId, $itemType)
{
/**
* @todo 重新设计表结构
@@ -88,13 +89,13 @@ class PointGift extends Repository
* 没有预留独立的条目编号，先这么将就实现吧
*/
$records = PointGiftModel::query()
- ->where('type = :type:', ['type' => PointGiftModel::TYPE_COURSE])
+ ->where('type = :type:', ['type' => $itemType])
->execute();
if ($records->count() == 0) return false;
foreach ($records as $record) {
- if ($record->attrs['id'] == $courseId) {
+ if ($record->attrs['id'] == $itemId) {
return $record;
}
}
diff --git a/app/Services/Logic/Deliver/CourseDeliver.php b/app/Services/Logic/Deliver/CourseDeliver.php
index 4645a5c7..4259aba4 100644
--- a/app/Services/Logic/Deliver/CourseDeliver.php
+++ b/app/Services/Logic/Deliver/CourseDeliver.php
@@ -11,6 +11,7 @@ use App\Models\Course as CourseModel;
use App\Models\CourseUser as CourseUserModel;
use App\Models\ImGroupUser as ImGroupUserModel;
use App\Models\User as UserModel;
+use App\Repos\CourseUser as CourseUserRepo;
use App\Repos\ImGroup as ImGroupRepo;
use App\Repos\ImGroupUser as ImGroupUserRepo;
use App\Repos\ImUser as ImUserRepo;
@@ -20,6 +21,13 @@ class CourseDeliver extends LogicService
{
public function handle(CourseModel $course, UserModel $user)
+ {
+ $this->revokeCourseUser($course, $user);
+ $this->handleCourseUser($course, $user);
+ $this->handleImGroupUser($course, $user);
+ }
+
+ protected function handleCourseUser(CourseModel $course, UserModel $user)
{
if ($course->model == CourseModel::MODEL_OFFLINE) {
$expiryTime = strtotime($course->attrs['end_date']);
@@ -28,7 +36,6 @@ class CourseDeliver extends LogicService
}
$courseUser = new CourseUserModel();
-
$courseUser->user_id = $user->id;
$courseUser->course_id = $course->id;
$courseUser->expiry_time = $expiryTime;
@@ -39,6 +46,12 @@ class CourseDeliver extends LogicService
$course->user_count += 1;
$course->update();
+ $user->course_count += 1;
+ $user->update();
+ }
+
+ protected function handleImGroupUser(CourseModel $course, UserModel $user)
+ {
$groupRepo = new ImGroupRepo();
$group = $groupRepo->findByCourseId($course->id);
@@ -52,9 +65,7 @@ class CourseDeliver extends LogicService
$groupUser = $groupUserRepo->findGroupUser($group->id, $user->id);
if (!$groupUser) {
-
$groupUser = new ImGroupUserModel();
-
$groupUser->group_id = $group->id;
$groupUser->user_id = $user->id;
$groupUser->create();
@@ -67,4 +78,20 @@ class CourseDeliver extends LogicService
}
}
+ protected function revokeCourseUser(CourseModel $course, UserModel $user)
+ {
+ $courseUserRepo = new CourseUserRepo();
+
+ $relations = $courseUserRepo->findByCourseAndUserId($course->id, $user->id);
+
+ if ($relations->count() == 0) return;
+
+ foreach ($relations as $relation) {
+ if ($relation->deleted == 0) {
+ $relation->deleted = 1;
+ $relation->update();
+ }
+ }
+ }
+
}
diff --git a/app/Services/Logic/Deliver/PackageDeliver.php b/app/Services/Logic/Deliver/PackageDeliver.php
index 36586f7a..709fdc83 100644
--- a/app/Services/Logic/Deliver/PackageDeliver.php
+++ b/app/Services/Logic/Deliver/PackageDeliver.php
@@ -7,13 +7,8 @@
namespace App\Services\Logic\Deliver;
-use App\Models\CourseUser as CourseUserModel;
-use App\Models\ImGroupUser as ImGroupUserModel;
use App\Models\Package as PackageModel;
use App\Models\User as UserModel;
-use App\Repos\ImGroup as ImGroupRepo;
-use App\Repos\ImGroupUser as ImGroupUserRepo;
-use App\Repos\ImUser as ImUserRepo;
use App\Repos\Package as PackageRepo;
use App\Services\Logic\Service as LogicService;
@@ -27,43 +22,8 @@ class PackageDeliver extends LogicService
$courses = $packageRepo->findCourses($package->id);
foreach ($courses as $course) {
-
- $courseUser = new CourseUserModel();
-
- $courseUser->user_id = $user->id;
- $courseUser->course_id = $course->id;
- $courseUser->expiry_time = strtotime("+{$course->study_expiry} months");
- $courseUser->role_type = CourseUserModel::ROLE_STUDENT;
- $courseUser->source_type = CourseUserModel::SOURCE_CHARGE;
- $courseUser->create();
-
- $course->user_count += 1;
- $course->update();
-
- $imUserRepo = new ImUserRepo();
-
- $imUser = $imUserRepo->findById($user->id);
-
- $groupRepo = new ImGroupRepo();
-
- $group = $groupRepo->findByCourseId($course->id);
-
- $groupUserRepo = new ImGroupUserRepo();
-
- $groupUser = $groupUserRepo->findGroupUser($group->id, $user->id);
-
- if (!$groupUser) {
- $groupUser = new ImGroupUserModel();
- $groupUser->group_id = $group->id;
- $groupUser->user_id = $user->id;
- $groupUser->create();
-
- $imUser->group_count += 1;
- $imUser->update();
-
- $group->user_count += 1;
- $group->update();
- }
+ $deliver = new CourseDeliver();
+ $deliver->handle($course, $user);
}
}
diff --git a/app/Validators/PointGift.php b/app/Validators/PointGift.php
index 2a296437..5c1460ca 100644
--- a/app/Validators/PointGift.php
+++ b/app/Validators/PointGift.php
@@ -177,4 +177,11 @@ class PointGift extends Validator
return $validator->checkCourse($id);
}
+ public function checkVip($id)
+ {
+ $validator = new Vip();
+
+ return $validator->checkVip($id);
+ }
+
}
diff --git a/db/migrations/20220607014823.php b/db/migrations/20220607014823.php
new file mode 100644
index 00000000..02a12daf
--- /dev/null
+++ b/db/migrations/20220607014823.php
@@ -0,0 +1,51 @@
+handleSiteSettings();
+ }
+
+ protected function handleSiteSettings()
+ {
+ $rows =
+ [
+ [
+ 'section' => 'site',
+ 'item_key' => 'isp_sn',
+ 'item_value' => '',
+ ],
+ [
+ 'section' => 'site',
+ 'item_key' => 'isp_link',
+ 'item_value' => 'https://dxzhgl.miit.gov.cn',
+ ],
+ [
+ 'section' => 'site',
+ 'item_key' => 'company_sn',
+ 'item_value' => '',
+ ],
+ [
+ 'section' => 'site',
+ 'item_key' => 'company_sn_link',
+ 'item_value' => '',
+ ],
+ ];
+
+ $this->insertSettings($rows);
+ }
+
+}
\ No newline at end of file
diff --git a/db/migrations/SettingTrait.php b/db/migrations/SettingTrait.php
new file mode 100644
index 00000000..cff86d00
--- /dev/null
+++ b/db/migrations/SettingTrait.php
@@ -0,0 +1,34 @@
+ $row) {
+ $exists = $this->settingExits($row['section'], $row['item_key']);
+ if ($exists) unset($rows[$key]);
+ }
+
+ if (count($rows) == 0) return;
+
+ $this->table('kg_setting')->insert($rows)->save();
+ }
+
+ protected function settingExits($section, $itemKey)
+ {
+ $row = $this->getQueryBuilder()
+ ->select('*')
+ ->from('kg_setting')
+ ->where(['section' => $section, 'item_key' => $itemKey])
+ ->execute()->fetch();
+
+ return $row ? true : false;
+ }
+
+}
\ No newline at end of file
diff --git a/public/static/admin/js/media.upload.js b/public/static/admin/js/media.upload.js
index fc303673..2bcc0656 100644
--- a/public/static/admin/js/media.upload.js
+++ b/public/static/admin/js/media.upload.js
@@ -46,6 +46,7 @@ layui.use(['jquery', 'element'], function () {
uploader.done().then(function (result) {
$('input[name=file_id]').val(result.fileId);
+ $('#vod-submit').removeAttr('disabled').removeClass('layui-btn-disabled');
$.ajax({
type: 'POST',
url: $('#vod-form').attr('action'),