Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app/shop/controllers/UserController.php

@@ -39,8 +39,7 @@ class UserController extends BaseController
                 $where['name'] = ['like', $search];
             }
         }
-        //$list = CustomService::getOldCustomList($where);
-        $list = UserService::getUserList($where);
+        $list = CustomService::getOldCustomList($where);
         util::success($list);
     }
 
@@ -97,6 +96,7 @@ class UserController extends BaseController
     //充值 shish 2019.12.1
     public function actionRecharge()
     {
+        util::fail('此功能已停用');
         $post = Yii::$app->request->post();
         $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
         AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
@@ -126,6 +126,7 @@ class UserController extends BaseController
     //升级 shish 2019.12.1
     public function actionUpgrade()
     {
+        util::fail('此功能已停用');
         $post = Yii::$app->request->post();
         $userId = isset($post['userId']) ? $post['userId'] : 0;
         $member = isset($post['member']) ? $post['member'] : 0;

biz/custom/services/CustomService.php

@@ -15,6 +15,26 @@ class CustomService extends BaseService
     public static function getOldCustomList($where)
     {
         $data = CustomClass::getList('*', $where, 'visitTime DESC');
+        $data['list'] = [
+            [
+                'id' => 12545138,
+                'mobile' => 15280215347,
+                "userName" => "石头",
+                "avatar" => "https://img.huaml.com/wx/avatar/12358/202005/23/b903ac24555fc0f94af3ebd866543c7e.jpg",
+                "avatarUrl" => "https://img.huaml.com/wx/avatar/12358/202005/23/b903ac24555fc0f94af3ebd866543c7e.jpg",
+                "smallAvatarUrl" => "https://img.huaml.com/wx/avatar/12358/202005/23/b903ac24555fc0f94af3ebd866543c7e_small.jpg",
+                'member' => 3,
+                'visitTimeFormat' => '05-29 22:46',
+                'userAsset' => [
+                    'growth' => 185,
+                    'discount' => '1.00',
+                    'balance' => 0.00,
+                    'subscribe' => 0,
+                    'store' => 0,
+                ]
+            ]
+        ];
+
         $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
         if (empty($list)) {
             return $data;

biz/order/services/OrderService.php

@@ -74,7 +74,7 @@ class OrderService extends BaseService
     //取客户最近若干条订单 shish 2019.11.30
     public static function getUserOrder($userId, $limit = 10, $order = null, $with = null)
     {
-        $where = ['userId' => $userId, 'payStatus' => 1];
+        $where = ['adminId' => $userId, 'payStatus' => 1];
         return self::getLimitList('*', $where, $limit, $order, $with);
     }