wesmiler 2 vuotta sitten
vanhempi
commit
9ce6d821de

+ 3 - 1
app/Http/Controllers/Api/v1/TestController.php

@@ -16,7 +16,9 @@ class TestController extends webApp
 
     public function check()
     {
-        $result = WalletService::make()->getAddressPrivateKey('f1b9e4116d6895ba6657c59fbb00b555c1ef0f5ebfb8aeab8657ecf5c9f8bbe4','TSNAmNyXkCKvBR5YLSVSUD3rg1ghaWFbes',1);
+        $result = WalletService::make()->checkAddress('TSNAmNyXkCKvBR5YLSVSUD3rg1ghaWFbes');
+        $result1 = WalletService::make()->checkAddress('TSNAmNyXkCKvBR5YLSVSUD3rg1ghaWFbes11');
+        var_dump($result1);
 //        $result = SupplyService::make()->getApiData('getGoodsCategory');
         return showJson('获取结果',true, $result);
     }

+ 2 - 1
app/Http/Validator/MemberValidator.php

@@ -56,7 +56,8 @@ class MemberValidator extends BaseValidator
         'withdraw'=> ['money','coin_type'],
         'trade'=> ['email','pay_password','code'],
         'modify_email'=> ['email','new_email'],
-        'modify'=> ['id','nickname','gender']
+        'modify'=> ['nickname','gender'],
+        'wallet'=> ['email','trc_url','code']
     ];
 
     /**

+ 15 - 1
app/Services/Api/MemberService.php

@@ -766,7 +766,7 @@ class MemberService extends BaseService
 
             // 推荐人验证
             $inviteInfo = $this->model->where(['code' => $parentCode, 'mark' => 1])
-                ->select(['id', 'parents', 'parent_id'])
+                ->select(['id', 'parents', 'parent_id','trc_url'])
                 ->first();
             $parentId = isset($inviteInfo['id']) ? $inviteInfo['id'] : 0;
             $parents = isset($inviteInfo['parents']) ? $parentId.','.$inviteInfo['parents'] : ($parentId ? $parentId . ',' : '');
@@ -820,6 +820,20 @@ class MemberService extends BaseService
             }
         }
 
+        $trcUrl = isset($params['trc_url'])? trim($params['trc_url']) : '';
+        $userTrcUrl = isset($info['trc_url'])? trim($info['trc_url']) : '';
+        if(isset($params['trc_url']) && $trcUrl){
+            if($trcUrl != $userTrcUrl){
+                if($this->model->where(['trc_url'=> $trcUrl,'mark'=>1])->whereNotIn('id',[$userId])->value('id')){
+                    $this->error = 1048;
+                    return false;
+                }
+
+
+            }
+
+        }
+
         // 修改数据
         $nickname = isset($params['nickname']) ? $params['nickname'] : '';
         if (isset($params['nickname']) && $nickname) {

+ 11 - 0
app/Services/WalletService.php

@@ -207,6 +207,17 @@ class WalletService extends BaseService
     }
 
     /**
+     * 验证地址
+     * @param $address
+     * @return string
+     */
+    public function checkAddress($address)
+    {
+        $tron = new Tron();
+        return $tron->getBase58CheckAddress($address);
+    }
+
+    /**
      * USDT-TRC20余额
      * @param $address
      * @return false|float|string

+ 1 - 0
resources/lang/zh-cn/api.php

@@ -47,6 +47,7 @@ return [
     '1045' => '供应链请求失败,请检查配置',
     '1046' => '供应链授权失败,请检查配置',
     '1047' => '请求频繁',
+    '1048' => '钱包地址已被使用',
 
     // 登录注册
     '2001'=> '账号非法或未注册',