调整注册时，绑定代理

application/admin/view/user/group/edit.html

@@ -43,15 +43,15 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="c-real_name" class="control-label col-xs-12 col-sm-2">{:__('Real name')}:</label>
+        <label for="c-account_name" class="control-label col-xs-12 col-sm-2">{:__('Real name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-real_name"  class="form-control" name="row[real_name]" type="text" value="{$row.real_name|htmlentities}">
+            <input id="c-account_name"  class="form-control" name="row[account_name]" type="text" value="{$row.account_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label for="c-account_name" class="control-label col-xs-12 col-sm-2">{:__('Bank name')}:</label>
+        <label for="c-bank_name" class="control-label col-xs-12 col-sm-2">{:__('Bank name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-account_name"  class="form-control" name="row[account_name]" type="text" value="{$row.account_name|htmlentities}">
+            <input id="c-bank_name"  class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
         </div>
     </div>
 

application/api/controller/Money.php

@@ -30,7 +30,7 @@ class Money extends Api
 
         $data['amount_list'] = [100,200,500,1000,5000,10000];//快捷输入额度
         $data['usdt'] = $data['bank'] = 1;
-        $recharge_info = UserModel::getAgentRechargeInfoByAgentId($user['agent_id']);
+        $recharge_info = UserModel::getAgentRechargeInfoByAgentId($user);
         if(empty($recharge_info)){
             $this->error(__('无充值信息'));
         }
@@ -60,7 +60,7 @@ class Money extends Api
         }
 
         $user = $this->auth->getUser();
-        $recharge_info = UserModel::getAgentRechargeInfoByAgentId($user['agent_id']);
+        $recharge_info = UserModel::getAgentRechargeInfoByAgentId($user);
         if(empty($recharge_info)){
             $this->error(__('无充值信息'));
         }

application/common/library/Auth.php

@@ -177,6 +177,9 @@ class Auth
             'agent_id' => $parent_info['agent_id'],
             'user_type'=> 1,//真人
         ];
+        if($parent_info['is_agent']){
+            $user_data['agent_id'] = $parent_info['id'];
+        }
         $user_data = array_merge($user_data, [
             'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $mobile) ? substr_replace($mobile, '****', 3, 4) : $mobile,
             'salt'      => Random::alnum(),

application/common/model/Users.php

@@ -51,12 +51,20 @@ class Users extends Model
      * @param $invitation_code
      * @return array|null
      */
-    public static function getAgentRechargeInfoByAgentId($agent_id)
+    public static function getAgentRechargeInfoByAgentId($user)
     {
         $data['usdt']     = '';
         $data['bank']     = [];
-        $data['agent_id'] = $agent_id;
-        $info = self::where('id', $agent_id)
+        $data['agent_id'] = $user['agent_id'];
+        if(empty($data['agent_id'])){
+            $parent_info = self::where('id', $user['parent_id'])
+                ->where('is_agent', 1)
+                ->where('is_lock', 0)
+                ->where('is_delete', 0)
+                ->find();
+            $data['agent_id'] = $parent_info['agent_id'];
+        }
+        $info = self::where('id', $data['agent_id'])
             ->where('is_agent', 1)
             ->where('is_lock', 0)
             ->where('is_delete', 0)
@@ -83,7 +91,7 @@ class Users extends Model
             $bank_info = json_decode($info['agent_bank_info'], true) ;
             $data['bank']['bank_name'] = $bank_info['bank_name']?? '';
             $data['bank']['bank_card'] = $bank_info['bank_card']?? '';
-            $data['bank']['real_name'] = $bank_info['real_name']?? '';
+            $data['bank']['account_name'] = $bank_info['account_name']?? '';
         }
         if(empty($data['usdt']) && empty($data['bank'])){
             return [];