afa 2 months ago
parent
commit
eae43a403c

+ 3 - 4
application/admin/controller/user/Airdrop.php

@@ -89,10 +89,9 @@ class Airdrop extends Backend
                 $this->model->validateFailException()->validate($validate);
             }
             if($params['type_id'] == 0){
-                $params['address'] =  (substr($params['address'], 0, 2) == '0x')? $params['address']: (new UserModel)->getUserByUid($params['address']);
-                $user = (new UserModel)->getByAddress($params['address']);
-                if(empty($user)) throw new Exception('用户不存在');
-                WelfareLoginc::setUserProductOrder($params['num'], 0, 0, 0, $params['product_id'], $user->id, ProductOrder::Airdrop);
+                $user_id = UserModel::getUserByUid($params['address'], (substr($params['address'], 0, 2) == '0x')? 0: 1);
+                if(empty($user_id)) throw new Exception('用户不存在');
+                WelfareLoginc::setUserProductOrder($params['num'], 0, 0, 0, $params['product_id'], $user_id, ProductOrder::Airdrop);
                 $params['status'] = 1;
             }
             if($params['type_id'] == 1){

+ 5 - 3
application/common/model/UserModel.php

@@ -81,9 +81,11 @@ class UserModel extends Model
     {   
         return self::where('id', $uid)->value("parent_id");
     }
-
-    public function getUserByUid($nickname){
-        return self::where('nickname', $nickname)->value('address');
+   
+    //根据用户昵称获取用户ID: 0 地址 1 昵称
+    public static function getUserByUid(string $nickname, int $type = 0){
+        $map = $type == 1 ? ['nickname' => $nickname] : ['address' => $nickname];
+        return self::where($map)->value('id');
     }
 
     public function getAllAddress()