用户资产

common/behaviors/LoginStatusAuthInterceptor.php

@@ -20,7 +20,7 @@ class LoginStatusAuthInterceptor extends ActionFilter
     {
         $request_class = get_class($action->controller);
         $request_action = $action->id;
-        if(strpos($request_class, 'UserController') && 'login' == $request_action){
+        if('login' == $request_action || 'user-sync' == $request_action){
             return true;
         }
         $token_string = Yii::$app->request->headers->get('Token');

common/behaviors/UserAuthInterceptor.php

@@ -23,7 +23,7 @@ class UserAuthInterceptor extends ActionFilter
 
         $request_class = get_class($action->controller);
         $request_action = $action->id;
-        if(strpos($request_class, 'UserController') && 'login' == $request_action){
+        if('login' == $request_action || 'user-sync' == $request_action){
             return true;
         }
         $token_string = Yii::$app->request->headers->get('Token');

common/service/trusteeship/TrusteeShipService.php

@@ -43,9 +43,9 @@ class TrusteeShipService
             return ['code' => -1, 'msg' => $ch->errorText];
         }
         if (200 == $result['code'] && isset($result['data'])) {
-            return $result['data'];
+            return ['code' => $result['code'], 'msg' =>$result['data']];
         } else {
-            return ['code' => -1, 'msg' => $result['error']];
+            return ['code' => -1, 'msg' => $result['message']];
         }
     }
 
@@ -62,4 +62,11 @@ class TrusteeShipService
 
         return $this->send("GET", $uri, $params);
     }
+
+    public function getUserAsset($params = [])
+    {
+        $uri = 'backend/user/asset';
+
+        return $this->send("GET", $uri, $params);
+    }
 }

wallet/controllers/UserController.php

@@ -23,8 +23,8 @@ class UserController extends BaseController
         $code = 0;
         $model = new LoginForm();
         $model->setScenario(LoginForm::SCENARIOS_LOGIN);
-        $model->load(Yii::$app->request->post(),'');
-        if(!$model->login()){
+        $model->load(Yii::$app->request->post(), '');
+        if (!$model->login()) {
             $msg = implode(", ", \yii\helpers\ArrayHelper::getColumn($model->errors, 0, false)); // Model's Errors string
             $data = null;
             $code = -1;
@@ -47,7 +47,7 @@ class UserController extends BaseController
             'uid' => isset($user->bind_uid) ? $user->bind_uid : $user->uid,
             'type' => isset($user->bind_uid) ? 2 : 1
         ];
-        doEnd :
+
         return ['code' => $code, 'msg' => $msg, 'data' => $data];
     }
 
@@ -57,13 +57,13 @@ class UserController extends BaseController
     public function actionUserSync()
     {
         $items = Yii::$app->request->post();
-        if(count($items['items']) > 10){
-            return ['code' => -1,'data' => [], 'msg' => '一次最多同步20条数据'];
+        if (count($items['items']) > 10) {
+            return ['code' => -1, 'data' => [], 'msg' => '一次最多同步20条数据'];
         }
         $duplicate = 0;
-        foreach ($items['items'] as $key => $item){
+        foreach ($items['items'] as $key => $item) {
             $model = Admin::find()->where(['username' => $item['username']])->andWhere(['platform_id' => (int)$item['platform']])->one();
-            if($model){
+            if ($model) {
                 $duplicate++;
                 continue;
             }
@@ -81,10 +81,10 @@ class UserController extends BaseController
                 $item['platform']
             ];
         }
-        if(!empty($datas)){
+        if (!empty($datas)) {
             Admin::loadArray($datas);
         }
-        return ['code' => 1,'data' => [], 'msg' => '数据更新成功，共有 '.$duplicate.' 条重复'];
+        return ['code' => 1, 'data' => [], 'msg' => '数据更新成功，共有 ' . $duplicate . ' 条重复'];
 
 
         $header = Yii::$app->request->headers;
@@ -94,8 +94,8 @@ class UserController extends BaseController
         $data = [
             'bind_uid' => $post['bind_uid'],
             'username' => $post['username'],
-            'salt' =>  Yii::$app->security->generateRandomString(),
-            'password' =>  Yii::$app->security->generatePasswordHash('123456'),
+            'salt' => Yii::$app->security->generateRandomString(),
+            'password' => Yii::$app->security->generatePasswordHash('123456'),
             'reg_time' => time(),
             'reg_ip' => ip2long('127.0.0.1'),
             'last_login_time' => 0,
@@ -104,16 +104,17 @@ class UserController extends BaseController
             'status' => 1,
             'platform_id' => $platform_id
         ];
-        $role  = Yii::$app->request->post('role', 'GHPwallet');
+        $role = Yii::$app->request->post('role', 'GHPwallet');
 
         $model = new Admin();
-        if($model->load($data, '') && $model->save()) {
+        if ($model->load($data, '') && $model->save()) {
             $auth = Yii::$app->authManager;
             $role = $auth->getRole($role);
             $auth->assign($role, $model->uid);
             exit;
         } else {
-            var_dump($model->errors);exit;
+            var_dump($model->errors);
+            exit;
         }
     }
 
@@ -124,12 +125,28 @@ class UserController extends BaseController
     public function actionUserList()
     {
         $page = Yii::$app->request->get('page', 1);
+        $size = Yii::$app->request->get('size', 15);
+        $real_type = Yii::$app->request->get('real_type', '');
+        $search_type = Yii::$app->request->get('search_type', 'user');
+        $search = Yii::$app->request->get('search', '');
+        $start_time = Yii::$app->request->get('start_time', '');
+        $end_time = Yii::$app->request->get('end_time', '');
         $params = [
-            'page' => $page
+            'page' => $page,
+            'size' => $size,
+            'real_type' => $real_type,
+            'search_type' => $search_type,
+            'search' => $search,
+            'start_time' => $start_time,
+            'end_time' => $end_time
         ];
+
         $service = new TrusteeShipService();
-        $result  = $service->getUserList($params);
-        return ['code' => 1,'data' => $result, 'msg' => 'success'];
+        $result = $service->getUserList($params);
+        if (200 !== $result['code']) {
+            return ['code' => $result['code'], 'data' => [], 'msg' => $result['msg']];
+        }
+        return ['code' => 1, 'data' => $result['msg'], 'msg' => 'success'];
     }
 
     /**

wallet/controllers/WalletController.php

@@ -35,4 +35,18 @@ class WalletController extends BaseController
         $result = $service->getWalletBalance($params);
         return ['code' => 1, 'data' => $result, 'msg' => 'success'];
     }
+
+    public function actionUserAsset()
+    {
+        $uid = Yii::$app->request->get('uid', '');
+        $params = [
+            'uid' => $uid
+        ];
+        $service = new TrusteeShipService();
+        $result = $service->getUserAsset($params);
+        if (200 !== $result['code']) {
+            return ['code' => $result['code'], 'data' => [], 'msg' => $result['msg']];
+        }
+        return ['code' => 1, 'data' => $result['msg'], 'msg' => 'success'];
+    }
 }
\ No newline at end of file