From cab271edfbb9e12f21a82e19492b36397f09f597 Mon Sep 17 00:00:00 2001 From: 1748153932 <1748153932@qq.com> Date: Wed, 13 Dec 2023 14:47:37 +0800 Subject: [PATCH] 111 --- app/command/brand.php | 62 +++++++++++++++++++ .../repositories/user/UserRepository.php | 10 +++ app/controller/admin/user/User.php | 12 +++- app/controller/api/user/User.php | 4 ++ config/console.php | 2 + 5 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 app/command/brand.php diff --git a/app/command/brand.php b/app/command/brand.php new file mode 100644 index 0000000..7072a14 --- /dev/null +++ b/app/command/brand.php @@ -0,0 +1,62 @@ + +// +---------------------------------------------------------------------- + +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- + +declare (strict_types=1); + +namespace app\command; + +use Swoole\Coroutine\MySQL\Exception; +use think\console\Command; +use think\console\Input; +use think\console\input\Argument; +use think\console\input\Option; +use think\console\Output; +use think\event\RouteLoaded; +use think\facade\Cache; +use think\facade\Route; +use app\common\repositories\system\auth\MenuRepository; + +// /www/server/php/74/bin/php /server/wwwroot/crmeb/think brand +class brand extends Command +{ + protected function configure() + { + // 指令配置 + $this->setName('clearCache') + ->addArgument('cacheType',Argument::OPTIONAL, 'php think menu [1] / [2]') + ->setDescription('各种积分转换'); + } + + /** + * TODO + * @param Input $input + * @param Output $output + * @return int|void|null + * @author Qinii + * @day 4/24/22 + */ + protected function execute(Input $input, Output $output) + { + echo env('brand.brand_integral', '222');die; + } + + +} diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php index d273094..9447664 100644 --- a/app/common/repositories/user/UserRepository.php +++ b/app/common/repositories/user/UserRepository.php @@ -128,6 +128,16 @@ class UserRepository extends BaseRepository Elm::input('uid', '用户 ID', '')->disabled(true)->required(true), Elm::input('real_name', '真实姓名'), Elm::input('phone', '手机号'), + + Elm::input('brand_integral', '品宣贡积分'), + Elm::input('brand_value', '品宣贡献值'), + Elm::input('role_value', '角色贡献值'), + Elm::input('community_value', '社区贡献值'), +// Elm::input('all_value', '总贡献值', '')->disabled(true)->required(true), + Elm::input('brand_add', '增值积分'), + Elm::input('super_days', '自动转换超级积分的累加天数', '')->disabled(true)->required(true), + + Elm::date('birthday', '生日'), Elm::input('card_id', '身份证'), Elm::input('addres', '用户地址'), diff --git a/app/controller/admin/user/User.php b/app/controller/admin/user/User.php index 7c286f4..28999b6 100644 --- a/app/controller/admin/user/User.php +++ b/app/controller/admin/user/User.php @@ -197,7 +197,16 @@ class User extends BaseController */ public function update($id, UserValidate $validate, UserLabelRepository $labelRepository, UserGroupRepository $groupRepository) { - $data = $this->request->params(['real_name', 'phone', 'birthday', 'card_id', 'addres', 'mark', 'group_id', ['label_id', []], ['is_promoter', 0], ['status', 0]]); + $data = $this->request->params(['real_name', 'phone','role_value', + + 'brand_value', + 'brand_integral', + 'role_value', + 'community_value', + 'super_days', + 'brand_add', + + 'birthday', 'card_id', 'addres', 'mark', 'group_id', ['label_id', []], ['is_promoter', 0], ['status', 0]]); $validate->check($data); if (!$this->repository->exists($id)) return app('json')->fail('数据不存在'); @@ -213,6 +222,7 @@ class User extends BaseController if ($data['is_promoter']) $data['promoter_time'] = date('Y-m-d H:i:s'); if(!$data['birthday']) unset($data['birthday']); + $this->repository->update($id, $data); return app('json')->success('编辑成功'); diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php index 630d56b..7b1361b 100644 --- a/app/controller/api/user/User.php +++ b/app/controller/api/user/User.php @@ -24,6 +24,7 @@ use app\common\repositories\user\UserRepository; use app\common\repositories\user\UserVisitRepository; use app\validate\api\UserBaseInfoValidate; use crmeb\basic\BaseController; +use app\common\model\user\User as userModel; use crmeb\services\MiniProgramService; use crmeb\services\SmsService; use think\App; @@ -321,6 +322,9 @@ class User extends BaseController //分享视频/推文增加品宣积分 public function brand() { + $model = userModel::getDB(); + $query = $model->where('uid', 1)->find()->toArray(); + var_dump($query);die; $user = $this->user->uid; $type = $this->request->param('type'); diff --git a/config/console.php b/config/console.php index 28d5d0d..a85141c 100644 --- a/config/console.php +++ b/config/console.php @@ -37,5 +37,7 @@ return [ 'clear:cache' => 'app\command\clearCache', //更新热卖榜单 'change:hotTop' => 'app\command\changeHotTop', + //各种积分转换 + 'brand' => 'app\command\brand', ], ];