Merge branch 'dev-sc-260204' into dev

app/common/dao/shared/SharedProsperityUserLevelLogDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\shared\SharedProsperityUserLevelLog;
+
+class SharedProsperityUserLevelLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return SharedProsperityUserLevelLog::class;
+    }
+}

app/common/model/shared/SharedProsperityUserLevelLog.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityUserLevelLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_user_level_log';
+    }
+}

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -4,6 +4,7 @@ namespace app\common\repositories\shared;
 
 use app\common\dao\shared\SharedProsperityGroupUserDao;
 use app\common\dao\shared\SharedProsperityUserDao;
+use app\common\dao\shared\SharedProsperityUserLevelLogDao;
 use app\common\dao\user\UserDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
@@ -15,6 +16,7 @@ use app\entity\data\shared\SharedProsperityGroupUserEntity;
 use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;
 use think\db\exception\DbException;
+use think\facade\Db;
 
 class SharedProsperityUserRepository extends BaseRepository
 {
@@ -773,9 +775,32 @@ class SharedProsperityUserRepository extends BaseRepository
      * @date 2026/2/27 14:23
      * 更新用户等级
      */
-    public function updateLevel($userId, $level)
+    public function updateLevel($userId, $level, $operator, $remark)
     {
-        return $this->dao->updateByUserId($userId, ['partner_level' => $level]);
+        $userInfo = $this->dao->getWhere(['user_id' => $userId]);
+        if ($level == $userInfo->partner_level) {
+            return '等级未发生变化';
+        }
+        Db::startTrans();
+        try {
+            // 变更等级
+            $this->dao->updateByUserId($userId, ['partner_level' => $level]);
+            // 记录日志
+            /** @var SharedProsperityUserLevelLogDao $logDao */
+            $logDao = app()->make(SharedProsperityUserLevelLogDao::class);
+            $logDao->create([
+                'user_id' => $userId,
+                'old_level' => $userInfo->partner_level,
+                'new_level' => $level,
+                'operator' => $operator,
+                'remark' => $remark
+            ]);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return $e->getMessage();
+        }
+
     }
 
     /**

app/controller/admin/system/sharedProsperity/SharedProsperityUser.php

@@ -30,10 +30,13 @@ class SharedProsperityUser
     {
         /** @var SharedProsperityUserRepository $repository */
         $repository = app()->make(SharedProsperityUserRepository::class);
-        $params = app('request')->params(['user_id', 'partner_level']);
-        $res = $repository->updateLevel($params['user_id'], $params['partner_level']);
-        if (!$res) {
-            return app('json')->fail('更新失败');
+        $params = app('request')->params(['user_id', 'partner_level', 'remark']);
+        if (empty($params['user_id']) || empty($params['partner_level']) || empty($params['remark'])) {
+            return app('json')->fail('参数错误');
+        }
+        $res = $repository->updateLevel($params['user_id'], $params['partner_level'], request()->adminId(), $params['remark']);
+        if (is_string($res)) {
+            return app('json')->fail($res);
         }
         return app('json')->success('更新成功');
     }