commit

app/api/controller/user/UserBillController.php

@@ -77,6 +77,7 @@ class UserBillController
         $data['list'] = User::getUserSpreadGrade($uid, $spreadInfo['grade'], $spreadInfo['sort'], $spreadInfo['keyword'], $spreadInfo['page'], $spreadInfo['limit']);
         $data['total'] = User::getSpreadCount($uid);
         $data['totalLevel'] = User::getSpreadLevelCount($uid);
+        $data['total_count'] = count(get_downline(User::select(), $uid));
         return app('json')->successful($data);
     }
 

app/api/controller/wechat/AuthController.php

@@ -63,6 +63,7 @@ class AuthController
             ['iv', ''],
             ['encryptedData', ''],
         ]);//获取前台传的code
+        file_put_contents('./5.txt', json_encode($data));
         try {
             //解密获取用户信息
             $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);

app/models/user/User.php

@@ -502,7 +502,8 @@ class User extends BaseModel
         $userStair = self::where('spread_uid', $uid)->column('uid');
         if (!count($userStair)) return [];
         if ($grade == 0) return self::getUserSpreadCountList(implode(',', $userStair), $orderBy, $keyword, $page, $limit);
-        $userSecondary = self::where('spread_uid', 'in', implode(',', $userStair))->column('uid');
+//        $userSecondary = self::where('spread_uid', 'in', implode(',', $userStair))->column('uid');
+        $userSecondary = get_downline(User::select(), $uid);
         return self::getUserSpreadCountList(implode(',', $userSecondary), $orderBy, $keyword, $page, $limit);
     }
 
@@ -530,6 +531,10 @@ class User extends BaseModel
         $model = $model->order($orderBy);
         $model = $model->page($page, $limit);
         $list = $model->select();
+        foreach ($list as &$item)
+        {
+            $item['price'] = StoreOrder::where('uid', $item['uid'])->where('paid', 1)->sum('pay_price');
+        }
         if ($list) return $list->toArray();
         else return [];
     }
@@ -750,7 +755,7 @@ class User extends BaseModel
                 $start_time = date('Y-m-01 00:00:00', strtotime('-1 month'));
                 $end_time = date('Y-m-d 23:59:59', strtotime(-date('d') . 'day'));
                 $price = StoreOrder::whereBetweenTime('add_time', strtotime('yesterday'), strtotime('today'))->where('paid', 1)->where('uid', $item['uid'])->sum('pay_price');// 月结
-                if ($item['spread_uid'] > 0 and $price > 0) {
+                if ($price > 0) {
                     $spread = getParents($item['uid'], $user->toArray());// 找到所有上级
                     $v1 = 0;
                     $v2 = 0;