钱包迁移，后台

application/admin/controller/user/User.php

@@ -59,7 +59,7 @@ class User extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $list = $this->model
-                ->with(['noble','preuser','auth','age'])
+                ->with(['noble','preuser','auth','age','userwallet'])
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);
@@ -67,6 +67,7 @@ class User extends Backend
                 $v->avatar = $v->avatar ? cdnurl($v->avatar, true) : letter_avatar($v->nickname);
                 $v->hidden(['password', 'salt']);
                 $v->getRelation('age')->visible(['name']);
+                $v->getRelation('userwallet')->visible(['money','jewel']);
             }
             $result = array("total" => $list->total(), "rows" => $list->items());
 
@@ -115,12 +116,21 @@ class User extends Backend
                 $params['has_info'] = 1;
                 $result = $this->model->allowField(true)->save($params);
                 $userId = $this->model->id;
+                //权限
                 $userPower = new UserPower();
                 $userPowerData['user_id'] = $userId;
                 $userPowerRes = $userPower->insertGetId($userPowerData);
                 if (!$userPowerRes) {
                     throw new Exception('创建用户权限失败');
                 }
+                //钱包
+                $userwallet = [
+                    'user_id' => $userId,
+                ];
+                $userWalletRes = Db::name('user_wallet')->insertGetId($userwallet);
+                if(!$userWalletRes){
+                    throw new Exception('创建用户钱包失败');
+                }
                 //创建IM用户
                 $tenimService = new TenimService();
                 $imParams['user_id'] = $userPowerRes;
@@ -363,10 +373,9 @@ class User extends Backend
                     $row->validateFailException(true)->validate($validate);
                 }
                 if (!empty($params['jewel_add'])) {//钻石充值
-                    $userWhere['id'] = $row['id'];
-                    $user = Db::name('user')->where($userWhere)->lock(true)->find();
-                    $before = isset($user['jewel']) ? $user['jewel'] : 0;
-                    $jewelRes = model('Wallet')->lockChangeAccountRemain($row['id'],$params['jewel_add'],'+',$before,'钻石充值',17,'jewel');
+                    $userWhere['user_id'] = $row['id'];
+                    $user = Db::name('user_wallet')->where($userWhere)->lock(true)->find();
+                    $jewelRes = model('Wallet')->lockChangeAccountRemain($row['id'],$params['jewel_add'],'+',0,'钻石充值',17,'jewel');
                     if (!$jewelRes['status']) {
                         throw new Exception($jewelRes['msg']);
                     }

application/admin/lang/zh-cn/user/user.php

@@ -24,8 +24,8 @@ return [
     'Bio'                                         => '格言',
     'Score'                                       => '积分',
     'Empirical'                                   => '经验值',
-    'Money'                                       => '账户余额',
-    'Jewel'                                       => '钻石余额',
+    'userwallet.Money'                            => '账户余额',
+    'userwallet.Jewel'                            => '钻石余额',
     'Money_add'                                   => '余额充值',
     'Jewel_add'                                   => '钻石充值',
     'Sound_coin'                                  => '声币余额',

application/admin/model/User.php

@@ -153,6 +153,11 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+    public function userwallet()
+    {
+        return $this->belongsTo('app\admin\model\Userwallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
+
     public function noble()
     {
         return $this->belongsTo('app\admin\model\noble\Level', 'noble', 'id', [], 'LEFT')->setEagerlyType(0);

application/common/library/Auth.php

@@ -238,8 +238,6 @@ class Auth
             //注册到钱包
             $wallet_data = [
                 'user_id' => $user->id,
-                'money'   => 0,
-                'jewel'   => 0,
             ];
             Db::name('user_wallet')->insertGetId($wallet_data);
             //注册成功的事件
@@ -874,8 +872,6 @@ class Auth
             //注册到钱包
             $wallet_data = [
                 'user_id' => $user->id,
-                'money'   => 0,
-                'jewel'   => 0,
             ];
             Db::name('user_wallet')->insertGetId($wallet_data);
             //注册成功的事件

public/assets/js/backend/user/user.js

@@ -53,8 +53,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'age', title: __('Age'), operate: 'LIKE'},
                         // {field: 'level', title: __('Level'), operate: 'BETWEEN', sortable: true},
                         // {field: 'empirical', title: __('Empirical'), operate: 'LIKE'},
-                        {field: 'money', title: __('Money'), operate: 'RANGE', sortable: true, width:100},
-                        {field: 'jewel', title: __('Jewel'), operate: 'RANGE', sortable: true, width:100},
+                        {field: 'userwallet.money', title: __('userwallet.money'), operate: false, sortable: true, width:100},
+                        {field: 'userwallet.jewel', title: __('userwallet.jewel'), operate: false, sortable: true, width:100},
                         // {field: 'sound_coin', title: __('Sound_coin'), operate: 'LIKE'},
                         // {field: 'noble.name', title: __('Noble'), operate: 'LIKE'},
                         // {field: 'noble_duetime', title: __('NobleDuetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE'},