diff --git a/app/admin/controller/user/User.php b/app/admin/controller/user/User.php index bd78893..a8c839e 100644 --- a/app/admin/controller/user/User.php +++ b/app/admin/controller/user/User.php @@ -6,6 +6,7 @@ use app\common\service\Jk8Services; use Throwable; use app\common\controller\Backend; use app\admin\model\User as UserModel; +use app\admin\model\UserScore; class User extends Backend { @@ -14,6 +15,7 @@ class User extends Backend * @phpstan-var UserModel */ protected object $model; + protected object $score; protected array $withJoinTable = ['userGroup']; protected $jk8Services; @@ -28,6 +30,7 @@ class User extends Backend parent::initialize(); $this->jk8Services = app(Jk8Services::class); $this->model = new UserModel(); + $this->score = new UserScore(); } /** @@ -170,4 +173,55 @@ class User extends Backend 'remark' => get_route_remark(), ]); } + + /** + * 钱包 + * @throws Throwable + */ + public function wallet(): void + { + $miniGames = config('mini_game') ?: []; + $pk = $this->model->getPk(); + $id = $this->request->param($pk); + + if ($this->request->isPost()) { + $this->model = new UserScore(); + parent::edit(); + return; + } + + $row = $this->model->find($id); + if (!$row) { + $this->error(__('Record not found')); + } + $existGameTypes = $row->userScore() + ->whereIn('game_type', array_keys($miniGames)) + ->column('game_type'); + + $scoreInsert = []; + foreach ($miniGames as $key => $name) { + if (!in_array($key, $existGameTypes)) { + $scoreInsert[] = [ + 'user_id' => $id, + 'game_type' => $key, + 'score' => 0, + ]; + } + } + + if (!empty($scoreInsert)) { + $row->userScore()->saveAll($scoreInsert); + } + + $data = [ + 'mini_game' => $miniGames, + 'score' => $row->userScore() + ->whereIn('game_type', array_keys($miniGames)) + ->withoutField(['user_id']) + ->order('game_type', 'asc') + ->select() + ]; + $this->success('', $data); + } + } \ No newline at end of file diff --git a/app/admin/model/User.php b/app/admin/model/User.php index 6a4846d..4c18626 100644 --- a/app/admin/model/User.php +++ b/app/admin/model/User.php @@ -4,6 +4,7 @@ namespace app\admin\model; use think\Model; use think\model\relation\BelongsTo; +use think\model\relation\HasMany; /** * User 模型 @@ -49,4 +50,9 @@ class User extends Model { return $this->where(['id' => $uid])->update(['password' => hash_password($newPassword), 'salt' => '']); } + + public function userScore(): HasMany + { + return $this->hasMany(UserScore::class, 'user_id'); + } } \ No newline at end of file diff --git a/app/admin/model/UserScore.php b/app/admin/model/UserScore.php new file mode 100644 index 0000000..2ca3f94 --- /dev/null +++ b/app/admin/model/UserScore.php @@ -0,0 +1,47 @@ +getOrigin('score'); + $after = $model->score; + // 1. 只有当分数确实发生变化时才记录日志 + if (bccomp($before, $after, 2) !== 0) { + // 计算分值变动（after - before） + $change = bcsub($after, $before); + $userScoreLog = new UserScoreLog(); + $userScoreLog->save([ + 'user_id' => $model->user_id, + 'game_type' => $model->game_type, + 'before' => $before, + 'after' => $after, + 'score' => $change, + 'memo' => '管理员手动调整', // 建议增加备注字段区分来源 + ]); + } + } + public function user(): BelongsTo + { + return $this->belongsTo(User::class, 'user_id'); + } +} \ No newline at end of file diff --git a/app/admin/model/UserScoreLog.php b/app/admin/model/UserScoreLog.php index 770bcf4..5882029 100644 --- a/app/admin/model/UserScoreLog.php +++ b/app/admin/model/UserScoreLog.php @@ -17,27 +17,6 @@ class UserScoreLog extends model protected $autoWriteTimestamp = true; protected $updateTime = false; - /** - * 入库前 - * @throws Throwable - */ - public static function onBeforeInsert($model): void - { - $user = User::where('id', $model->user_id)->lock(true)->find(); - if (!$user) { - throw new Exception("The user can't find it"); - } - if (!$model->memo) { - throw new Exception("Change note cannot be blank"); - } - $model->before = $user->score; - - $user->score += $model->score; - $user->save(); - - $model->after = $user->score; - } - public static function onBeforeDelete(): bool { return false; diff --git a/config/mini_game.php b/config/mini_game.php new file mode 100644 index 0000000..8b42ebf --- /dev/null +++ b/config/mini_game.php @@ -0,0 +1,8 @@ + 'Lucky Wheel', + 1002 => 'Golden Eggs', + 1003 => 'Daily Mission', + 1004 => 'Plinko Ball', +]; diff --git a/web/src/lang/backend/zh-cn/user/scoreLog.ts b/web/src/lang/backend/zh-cn/user/scoreLog.ts index d6cbb21..4cca472 100644 --- a/web/src/lang/backend/zh-cn/user/scoreLog.ts +++ b/web/src/lang/backend/zh-cn/user/scoreLog.ts @@ -5,4 +5,11 @@ export default { 'Please enter the change amount of points': '请输入积分变更数额', 'Points after change': '变更后积分', 'Please enter change remarks / description': '请输入变更备注/说明', + 'Game type' : '游戏', + 'game_type': { + 1001 : 'Lucky Wheel', + 1002 : 'Golden Eggs', + 1003 : 'Daily Mission', + 1004 : 'Plinko Ball' + } } diff --git a/web/src/lang/globs-en.ts b/web/src/lang/globs-en.ts index ef294d7..ebbe04b 100644 --- a/web/src/lang/globs-en.ts +++ b/web/src/lang/globs-en.ts @@ -47,4 +47,5 @@ export default { 'Expand generic search': 'Expand Universal Search', 'Link address': 'Link address', 'No route found to jump~': 'Failed to find a jump route.', + 'Members Promotion':'Members Promotion', } diff --git a/web/src/lang/globs-zh-cn.ts b/web/src/lang/globs-zh-cn.ts index e2508dc..49fd479 100644 --- a/web/src/lang/globs-zh-cn.ts +++ b/web/src/lang/globs-zh-cn.ts @@ -48,4 +48,5 @@ export default { 'Expand generic search': '展开公共搜索', 'Link address': '链接地址', 'No route found to jump~': '没有找到可以跳转的路由~', + 'Members Promotion':'玩家钱包', } diff --git a/web/src/views/backend/user/scoreLog/index.vue b/web/src/views/backend/user/scoreLog/index.vue index 676eaa8..5aa1999 100644 --- a/web/src/views/backend/user/scoreLog/index.vue +++ b/web/src/views/backend/user/scoreLog/index.vue @@ -4,7 +4,7 @@ walletLoadingId.value === row.id,