Merge branch 'dev-shichen' of shop/php into dev

app/common/dao/user/UserDao.php

@@ -446,4 +446,14 @@ class UserDao extends BaseDao
             return [];
         }
     }
+
+    /**
+     * @param $userId
+     * @return array
+     * 获取直推用户ID
+     */
+    public function getDirectUserIds($userId)
+    {
+        return $this::getModel()::getDB()->where('level_id', '=', $userId)->column('uid');
+    }
 }

app/common/dao/user/ZeroUserLineDao.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * zero user line dao
+ */
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\user\ZeroUserLine;
+
+class ZeroUserLineDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return ZeroUserLine::class;
+    }
+}

app/common/enum/user/ZeroUserEnum.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class ZeroUserEnum extends CommonEnum
+{
+    // 状态
+    const STATUS = [
+        0 => '失效',
+        1 => '正常',
+        2 => '合并',
+    ];
+    const STATUS_MAP = [
+        'FAILURE' => ['code' => 0, 'name' => '失效'],
+        'NORMAL' => ['code' => 1, 'name' => '正常'],
+        'MERGE' => ['code' => 2, 'name' => '合并'],
+    ];
+
+
+    // 是否带走团队
+    const IS_REMOVE = [
+        0 => '保留',
+        1 => '带走'
+    ];
+    const IS_REMOVE_MAP = [
+        'NO' => ['code' => 0, 'name' => '保留'],
+        'YES' => ['code' => 1, 'name' => '带走'],
+    ];
+}

app/common/model/user/ZeroUserLine.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * user_zero_line
+ */
+namespace app\common\model\user;
+
+
+use app\common\model\BaseModel;
+
+class ZeroUserLine extends BaseModel
+{
+
+    /**
+     * @return string
+     */
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    /**
+     * @return string
+     */
+    public static function tableName(): string
+    {
+        return 'user_zero_line';
+    }
+}

app/common/repositories/user/ZeroUserRepository.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\common\repositories\user;
+
+
+use app\common\dao\user\UserDao;
+use app\common\dao\user\ZeroUserLineDao;
+use app\common\repositories\BaseRepository;
+use think\db\exception\DbException;
+use think\facade\Db;
+
+class ZeroUserRepository extends BaseRepository
+{
+
+    private $systemUserId = 1;
+
+    /**
+     * @var ZeroUserLineDao
+     */
+    protected $dao;
+
+    /**
+     * UserGroupRepository constructor.
+     * @param  ZeroUserLineDao  $dao
+     */
+    public function __construct(ZeroUserLineDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * 插入或更新零号线用户数据
+     *
+     * @param  int|null  $id  用户ID，为null时表示新增
+     * @param  array  $data  用户数据
+     * @return \app\common\dao\BaseDao|bool|\think\Model
+     * @throws DbException
+     */
+    public function insertOrUpdate(?int $id, array $data)
+    {
+        // 团队昵称为空时，取用户昵称
+        $userDao = new UserDao();
+        if (empty($data['team_name'])) {
+            $userData = $userDao->get($data['team_uid']);
+            $data['team_name'] = $userData->nickname;
+        }
+
+        // 判断是更新现有记录还是创建新记录
+        if ($data['id'] > 0) {
+            return $this->dao->update($id, $data);
+        }
+
+        try {
+            Db::startTrans();
+            // 0号线用户修改节点
+            $userDao->update($data['team_uid'], ['level_id' => $this->systemUserId]);
+
+            // 如果不带走团队，所有直推用户节点id修改成上级id
+            if ($data['is_remove'] != 1) {
+                $directUserIds = $userDao->getDirectUserIds($data['team_uid']);
+                $upLevelId = $userData->level_id;
+                $userDao->updates($directUserIds, ['level_id' => $upLevelId]);
+            }
+            $this->dao->create($data);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            return false;
+        }
+    }
+}

app/controller/admin/user/NewUser.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace app\controller\admin\user;
+
+use app\common\repositories\user\ZeroUserRepository;
+use app\entity\admin\request\user\ZeroUserRequestEntity;
+use app\entity\admin\response\user\ZeroUserLineResponseEntity;
+use app\validate\admin\user\AddZeroUserValidate;
+use app\utils\EnumUtil;
+use think\response\Json;
+
+/**
+ * 零号线用户控制器
+ * 负责零号线用户的添加和更新操作
+ */
+class NewUser
+{
+    /**
+     * 用户仓库实例
+     * @var ZeroUserRepository
+     */
+    protected $repository;
+
+    /**
+     * 构造函数
+     *
+     * @param  ZeroUserRepository  $repository
+     */
+    public function __construct(ZeroUserRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * 添加或更新零号线用户
+     *
+     * @param  AddZeroUserValidate  $validate  验证器实例
+     * @return Json
+     */
+    public function addZeroUser(AddZeroUserValidate $validate): Json
+    {
+        // 执行验证
+        $validationResult = $validate->validate();
+        // 验证失败，返回错误信息
+        if ($validationResult['status'] === 'error') {
+            return app('json')->fail($validationResult['message']);
+        }
+
+        /** @var ZeroUserRequestEntity $entity 请求实体 */
+        $entity = $validationResult['data'];
+
+        // 自动验证枚举参数
+        $requestData = $entity->toUnderlineArray();
+        
+        // 使用智能枚举验证器自动验证，直接传递枚举类名
+        $validationResult = EnumUtil::autoValidate(\app\common\enum\user\ZeroUserEnum::class, $requestData);
+        if (!$validationResult['valid']) {
+            return app('json')->fail(implode('; ', $validationResult['errors']));
+        }
+        try {
+            // 执行插入或更新操作
+            $result = $this->repository->insertOrUpdate(
+                $entity->getId(),
+                $requestData
+            );
+            // 根据操作结果返回相应的响应
+            if ($result) {
+                $response = ZeroUserLineResponseEntity::success();
+                return app('json')->success($response->toResponseArray());
+            } else {
+                $response = ZeroUserLineResponseEntity::error();
+                return app('json')->fail($response->toResponseArray());
+            }
+        } catch (\Exception $e) {
+            // 记录详细异常日志
+            $errorMessage = '零号线用户操作异常: ' . $e->getMessage() .
+                           ' File: ' . $e->getFile() .
+                           ' Line: ' . $e->getLine();
+            \think\facade\Log::error($errorMessage);
+
+            // 根据环境返回不同的错误信息
+            $isDev = app()->isDebug();
+            if ($isDev) {
+                // 开发环境返回详细错误信息
+                return app('json')->fail('操作失败: ' . $e->getMessage());
+            } else {
+                // 生产环境返回友好提示
+                return app('json')->fail('系统繁忙，请稍后重试');
+            }
+        }
+    }
+}

app/controller/api/store/merchant/TaskProfits.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace app\controller\api\store\merchant;
+
+class TaskProfits
+{
+
+}

app/entity/admin/request/user/ZeroUserRequestEntity.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace app\entity\admin\request\user;
+
+use app\entity\request\RequestCommonEntity;
+
+/**
+ * 添加0号线用户请求参数
+ */
+class ZeroUserRequestEntity extends RequestCommonEntity
+{
+    // id
+    public $id;
+
+    // 万能验证码
+    public $customCode;
+
+    // 状态
+    public $status;
+
+    // 团队昵称
+    public $teamName;
+
+    // 团队长uid
+    public $teamUid;
+
+    // 是否移除团队
+    public $isRemove;
+
+    // 获取id
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    // 设置id
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    // 获取万能验证码
+    public function getCustomCode()
+    {
+        return $this->customCode;
+    }
+
+    // 设置万能验证码
+    public function setCustomCode($customCode)
+    {
+        $this->customCode = $customCode ?? null;
+        return $this;
+    }
+
+    // 获取团队昵称
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function setStatus($status)
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    // 获取团队昵称
+    public function getTeamName()
+    {
+        return $this->teamName ?? '';
+    }
+
+    public function setTeamName($teamName): ZeroUserRequestEntity
+    {
+        $this->teamName = $teamName;
+        return $this;
+    }
+
+    // 获取团队长uid
+    public function getTeamUid()
+    {
+        return $this->teamUid;
+    }
+
+    public function setTeamUid($teamUid): ZeroUserRequestEntity
+    {
+        $this->teamUid = $teamUid;
+        return $this;
+    }
+
+    // 获取是否移除
+    public function getIsRemove()
+    {
+        return $this->isRemove;
+    }
+
+    public function setIsRemove($isRemove): ZeroUserRequestEntity
+    {
+        $this->isRemove = $isRemove;
+        return $this;
+    }
+
+    /**
+     * 将请求参数转换为数组格式
+     * 用于数据库操作或API传输
+     * 动态获取当前类的所有公共属性，使用下划线分割的键名
+     *
+     * @return array
+     */
+    public function getArray(): array
+    {
+        $result = [];
+        $reflection = new \ReflectionClass($this);
+        $properties = $reflection->getProperties(\ReflectionProperty::IS_PUBLIC);
+        
+        foreach ($properties as $property) {
+            $propertyName = $property->getName();
+            // 跳过继承的属性
+            if ($property->getDeclaringClass()->getName() !== self::class) {
+                continue;
+            }
+            
+            // 将驼峰命名转换为下划线命名
+            $key = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $propertyName));
+            
+            // 获取对应的getter方法名
+            $getterMethod = 'get' . ucfirst($propertyName);
+            
+            if (method_exists($this, $getterMethod)) {
+                $result[$key] = $this->$getterMethod();
+            } else {
+                // 如果没有对应的getter方法，直接获取属性值
+                $result[$key] = $this->$propertyName;
+            }
+        }
+        
+        return $result;
+    }
+}

app/entity/admin/response/AdminCommonResponseEntity.php

@@ -0,0 +1,171 @@
+<?php
+
+namespace app\entity\admin\response;
+
+use app\entity\CommonEntity;
+
+/**
+ * 管理员公共响应实体
+ * 用于统一接口返回格式
+ */
+class AdminCommonResponseEntity extends CommonEntity
+{
+    /**
+     * 状态码
+     * @var int
+     */
+    public $code;
+
+    /**
+     * 消息内容
+     * @var string
+     */
+    public $message;
+
+    /**
+     * 响应数据
+     * @var mixed
+     */
+    public $data;
+
+    /**
+     * 时间戳
+     * @var int
+     */
+    public $timestamp;
+
+    /**
+     * 获取状态码
+     * @return int
+     */
+    public function getCode(): int
+    {
+        return $this->code;
+    }
+
+    /**
+     * 设置状态码
+     * @param int $code
+     * @return AdminCommonResponseEntity
+     */
+    public function setCode(int $code): AdminCommonResponseEntity
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    /**
+     * 获取消息内容
+     * @return string
+     */
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * 设置消息内容
+     * @param string $message
+     * @return AdminCommonResponseEntity
+     */
+    public function setMessage(string $message): AdminCommonResponseEntity
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    /**
+     * 获取响应数据
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * 设置响应数据
+     * @param mixed $data
+     * @return AdminCommonResponseEntity
+     */
+    public function setData($data): AdminCommonResponseEntity
+    {
+        $this->data = $data;
+        return $this;
+    }
+
+    /**
+     * 获取时间戳
+     * @return int
+     */
+    public function getTimestamp(): int
+    {
+        return $this->timestamp;
+    }
+
+    /**
+     * 设置时间戳
+     * @param int $timestamp
+     * @return AdminCommonResponseEntity
+     */
+    public function setTimestamp(int $timestamp): AdminCommonResponseEntity
+    {
+        $this->timestamp = $timestamp;
+        return $this;
+    }
+
+    /**
+     * 创建成功响应
+     * @param mixed $data 响应数据
+     * @param string $message 成功消息
+     * @param int $code 状态码
+     * @return AdminCommonResponseEntity
+     */
+    public static function success(string $message = '操作成功', int $code = 200, $data = null): AdminCommonResponseEntity
+    {
+        return (new self())
+            ->setCode($code)
+            ->setMessage($message)
+            ->setData($data)
+            ->setTimestamp(time());
+    }
+
+    /**
+     * 创建失败响应
+     * @param string $message 错误消息
+     * @param int $code 状态码
+     * @param mixed $data 额外数据
+     * @return AdminCommonResponseEntity
+     */
+    public static function error(string $message = '操作失败', int $code = 400, $data = null): AdminCommonResponseEntity
+    {
+        return (new self())
+            ->setCode($code)
+            ->setMessage($message)
+            ->setData($data)
+            ->setTimestamp(time());
+    }
+
+    /**
+     * 转换为数组格式
+     * @return array
+     */
+    public function toResponseArray(): array
+    {
+        return [
+            'code' => $this->code,
+            'message' => $this->message,
+            'data' => $this->data,
+            'timestamp' => $this->timestamp
+        ];
+    }
+
+    /**
+     * 转换为JSON字符串
+     * @return string
+     */
+    public function toJson(): string
+    {
+        return json_encode($this->toResponseArray(), JSON_UNESCAPED_UNICODE);
+    }
+}

app/entity/admin/response/user/ZeroUserLineResponseEntity.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\entity\admin\response\user;
+
+use app\entity\admin\response\AdminCommonResponseEntity;
+
+/**
+ * 零号线用户响应实体
+ * 继承自 AdminCommonResponseEntity，用于零号线用户相关操作的响应
+ * 此接口只需要返回成功或失败状态
+ */
+class ZeroUserLineResponseEntity extends AdminCommonResponseEntity
+{
+    // 直接使用父类的 success() 和 error() 方法
+    // 不需要额外字段，只需要返回操作状态
+    
+    /**
+     * 创建零号线用户操作成功响应
+     * @param  null  $data
+     * @param  string  $message
+     * @param  int  $code
+     * @return AdminCommonResponseEntity
+     */
+    public static function success(string $message = '零号线用户操作成功', int $code = 200, $data = null): AdminCommonResponseEntity
+    {
+        return parent::success($message);
+    }
+
+    /**
+     * 创建零号线用户操作失败响应
+     * @param  string  $message
+     * @param  int  $code
+     * @param  null  $data
+     * @return AdminCommonResponseEntity
+     */
+    public static function error(string $message = '零号线用户操作失败', int $code = 400, $data = null): AdminCommonResponseEntity
+    {
+        return parent::error($message, $code);
+    }
+}

app/utils/EnumUtil.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace app\utils;
+
+use ReflectionClass;
+use ReflectionException;
+
+/**
+ * 智能枚举验证器
+ * 自动发现并验证请求参数中的枚举字段
+ */
+class EnumUtil
+{
+    /**
+     * 自动验证请求参数中的枚举字段
+     *
+     * @param string|object $enumClassOrInstance 枚举类名或实例
+     * @param array $requestData 请求数据
+     * @return array 验证结果 ['valid' => bool, 'errors' => array]
+     */
+    public static function autoValidate($enumClassOrInstance, array $requestData): array
+    {
+        $errors = [];
+        
+        try {
+            $constants = self::getEnumConstants($enumClassOrInstance);
+
+            foreach ($constants as $constName => $enumValues) {
+                if (!self::isValidEnumArray($enumValues)) {
+                    continue;
+                }
+
+                $fieldName = self::constToFieldName($constName);
+
+                if (array_key_exists($fieldName, $requestData)) {
+                    $result = self::validateEnumValue($requestData[$fieldName], $enumValues, $constName);
+                    if (!$result['valid']) {
+                        $errors[] = $result['error'];
+                    }
+                }
+            }
+
+        } catch (ReflectionException $e) {
+            return [
+                'valid' => false,
+                'errors' => ["枚举验证异常: " . $e->getMessage()]
+            ];
+        }
+
+        return empty($errors) ? [
+            'valid' => true,
+            'errors' => []
+        ] : [
+            'valid' => false,
+            'errors' => $errors
+        ];
+    }
+
+    /**
+     * 获取枚举类的所有字段映射
+     *
+     * @param string|object $enumClassOrInstance 枚举类名或实例
+     * @return array 字段映射 [字段名 => 枚举值数组]
+     */
+    public static function getFieldMappings($enumClassOrInstance): array
+    {
+        $mappings = [];
+        
+        try {
+            $constants = self::getEnumConstants($enumClassOrInstance);
+
+            foreach ($constants as $constName => $enumValues) {
+                if (self::isValidEnumArray($enumValues)) {
+                    $mappings[self::constToFieldName($constName)] = $enumValues;
+                }
+            }
+
+        } catch (ReflectionException $e) {
+            // 忽略异常，返回空数组
+        }
+
+        return $mappings;
+    }
+
+    /**
+     * 获取枚举类的常量
+     *
+     * @param string|object $enumClassOrInstance
+     * @return array
+     * @throws ReflectionException
+     */
+    private static function getEnumConstants($enumClassOrInstance): array
+    {
+        return (new ReflectionClass($enumClassOrInstance))->getConstants();
+    }
+
+    /**
+     * 检查是否为有效的枚举数组（非MAP格式的数组）
+     *
+     * @param mixed $enumValues
+     * @return bool
+     */
+    private static function isValidEnumArray($enumValues): bool
+    {
+        return is_array($enumValues) && !empty($enumValues) && !self::isMapFormat($enumValues);
+    }
+
+    /**
+     * 将枚举常量名转换为字段名
+     *
+     * @param string $constName 常量名称
+     * @return string 字段名
+     */
+    private static function constToFieldName(string $constName): string
+    {
+        return strtolower($constName);
+    }
+
+    /**
+     * 验证单个枚举值
+     *
+     * @param mixed $value 要验证的值
+     * @param array $enumValues 枚举值数组
+     * @param string $constName 常量名称
+     * @return array 验证结果 ['valid' => bool, 'error' => string|null]
+     */
+    private static function validateEnumValue($value, array $enumValues, string $constName): array
+    {
+        $validValues = array_keys($enumValues);
+        $normalizedValue = is_numeric($value) ? (int)$value : $value;
+        
+        if (!in_array($normalizedValue, $validValues, true)) {
+            return [
+                'valid' => false,
+                'error' => self::constToFieldName($constName) . "参数错误，值：{$value}"
+            ];
+        }
+
+        return [
+            'valid' => true,
+            'error' => null
+        ];
+    }
+
+    /**
+     * 检查枚举值数组是否为MAP格式（包含code字段）
+     *
+     * @param array $enumValues 枚举值数组
+     * @return bool
+     */
+    private static function isMapFormat(array $enumValues): bool
+    {
+        if (empty($enumValues)) {
+            return false;
+        }
+        
+        $firstValue = reset($enumValues);
+        return is_array($firstValue) && isset($firstValue['code']);
+    }
+}

app/validate/admin/user/AddZeroUserValidate.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-09
+ *
+ *
+ */
+
+namespace app\validate\admin\user;
+
+use app\entity\admin\request\user\ZeroUserRequestEntity;
+use app\validate\CommonValidate;
+
+class AddZeroUserValidate extends CommonValidate
+{
+    protected $failException = true;
+
+    protected $rule = [
+        'custom_code|万能验证码' => 'in:4,6',
+        'status|状态' => 'require|integer',
+        'team_name|团队昵称' => 'max:20',
+        'team_uid|团队长' => 'require|integer',
+        'is_remove|是否移除团队' => 'require'
+    ];
+
+    protected $message = [
+        'custom_code.in' => '万能验证码错误',
+        'status.require' => '请选择状态',
+        'status.integer' => '请选择状态',
+        'team_uid.require' => '请输入团队长uid',
+        'team_uid.integer' => '请输入团队长uid',
+        'is_remove.require' => '请选择是否移除团队',
+    ];
+
+    /**
+     * 验证添加零用户请求
+     * 使用父类通用验证方法进行数据验证
+     *
+     * @return array
+     */
+    public function validate(): array
+    {
+        $data = $this->request->param();
+        if (!$this->check($data)) {
+            return [
+                'status' => 'error',
+                'message' => $this->getError()
+            ];
+        }
+        return [
+            'status' => 'success',
+            'data' => ZeroUserRequestEntity::newInstance($data)
+        ];
+    }
+}

route/admin.php

@@ -471,6 +471,11 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
         })->prefix('admin.user.User');
 
+
+        Route::group('newUser', function () {
+            Route::any('addZeroUser', '/addZeroUser')->name('addZeroUser');
+        })->prefix('admin.user.NewUser');
+
         Route::group('warehouse',function (){
             Route::get('getProvince', '/getProvince');//省
             Route::get('getCity/:id', '/getCity');//市