commit

app/api/controller/AuthController.php

@@ -300,11 +300,11 @@ class AuthController
             return app('json')->fail($e->getError());
         }
         $verifyCode = CacheService::get('code_' . $account);
-//        if (!$verifyCode)
-//            return app('json')->fail('请先获取验证码');
-//        $verifyCode = substr($verifyCode, 0, 6);
-//        if ($verifyCode != $captcha)
-//            return app('json')->fail('验证码错误');
+        if (!$verifyCode)
+            return app('json')->fail('请先获取验证码');
+        $verifyCode = substr($verifyCode, 0, 6);
+        if ($verifyCode != $captcha)
+            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

app/api/controller/user/UserBillController.php

@@ -76,7 +76,10 @@ class UserBillController
         $uid = $request->uid();
         $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);
+        $user = User::select();
+        $uid = get_downlines($user, $uid);
+        $data['totalLevel'] = User::where('uid', 'in', $uid)->count();
+        $data['order_count'] = StoreOrder::where('uid', 'in', $uid)->where('paid', 1)->sum('pay_price');// 团队总业界
         return app('json')->successful($data);
     }
 

app/api/controller/user/UserController.php

@@ -633,7 +633,7 @@ class UserController
             {
                 foreach ($release as $item)
                 {
-                    if ($item['already']+$item['release'] > $item['to_release']){
+                    if ($item['already']+$item['release'] >= $item['to_release']){
                         $number = $item['to_release'] - $item['already'];// 释放量
                         $integral = $number;// 积分
                         $item['already'] += $number;

app/common.php

@@ -643,11 +643,28 @@ if (!function_exists('do_request')) {
     if (!function_exists('get_downline')){
         //所有下级
         function get_downline($members,$id){
+            $arr=array();
+            foreach ($members as $key => $v) {
+                if($v['spread_uid']==$id){  //pid为0的是顶级分类
+                    if ($v['effective'] == 1){
+                        $arr[]=$v['uid'];
+                        $arr = array_merge($arr,get_downline($members,$v['uid']));
+                    }
+                }
+            }
+            return $arr;
+
+        }
+    }
+
+    if (!function_exists('get_downlines')){
+        //所有下级
+        function get_downlines($members,$id){
             $arr=array();
             foreach ($members as $key => $v) {
                 if($v['spread_uid']==$id){  //pid为0的是顶级分类
                     $arr[]=$v['uid'];
-                    $arr = array_merge($arr,get_downline($members,$v['uid']));
+                    $arr = array_merge($arr,get_downlines($members,$v['uid']));
                 }
             }
             return $arr;

app/models/system/SystemUserTask.php

@@ -275,7 +275,7 @@ class SystemUserTask extends BaseModel
     public static function DirectPush($task_id, $uid = 0, $start_time = 0, $number = 0)
     {
         $isComplete = false;
-        $sumCount = User::where('spread_uid', $uid)->count();
+        $sumCount = User::where('spread_uid', $uid)->where('effective', 1)->count();
         if ($sumCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
         return ['直推还需有效账户{$num}天', $sumCount, $isComplete];
     }
@@ -291,7 +291,6 @@ class SystemUserTask extends BaseModel
     public static function UnderTheUmbrella($task_id, $uid = 0, $start_time = 0, $number = 0)
     {
         $isComplete = false;
-
         $user = User::select();
         $userCount = get_downline($user, $uid);
         $sumCount = count($userCount);

app/models/user/User.php

@@ -483,9 +483,11 @@ class User extends BaseModel
     public static function getSpreadLevelCount($uid = 0)
     {
         if (!$uid) return false;
-        $uidSubordinate = self::where('spread_uid', $uid)->column('uid');
-        if (!count($uidSubordinate)) return 0;
-        return self::where('spread_uid', 'IN', implode(',', $uidSubordinate))->count();
+//        $uidSubordinate = self::where('spread_uid', $uid)->column('uid');
+//        if (!count($uidSubordinate)) return 0;
+        $user = self::select();
+        $uid = get_downlines($user, $uid);
+        return self::where('uid', 'in', $uid)->count();
     }
 
     /**
@@ -508,7 +510,7 @@ class User extends BaseModel
         if ($grade == 0) return self::getUserSpreadCountList(implode(',', $userStair), $orderBy, $keyword, $page, $limit);
         $userSecondary = self::where('spread_uid', 'in', implode(',', $userStair))->column('uid');
         $user = self::select();
-        $uid = get_downline($user, $uid);
+        $uid = get_downlines($user, $uid);
         return self::getUserSpreadCountList(implode(',', $uid), $orderBy, $keyword, $page, $limit);
     }
 
@@ -763,19 +765,20 @@ class User extends BaseModel
     public static function release_push($uid, $number, $to_release)
     {
         $user = self::where('uid', $uid)->find();
-        $release = StoreOrderRelease::where('uid', $uid)->where('status', 0)->select();
-        if (count($release) > 0){
-            if ($to_release <= 500){
-                $number = $number * 0.2;
-            }elseif($to_release > 500 and $to_release <= 2000){
-                $number = $number * 0.25;
-            }elseif($to_release > 200 and $to_release <= 4000){
-                $number = $number * 0.3;
+        if ($user){
+            $release = StoreOrderRelease::where('uid', $uid)->where('status', 0)->select();
+            if (count($release) > 0){
+                if ($to_release <= 500){
+                    $number = $number * 0.2;
+                }elseif($to_release > 500 and $to_release <= 2000){
+                    $number = $number * 0.25;
+                }elseif($to_release > 200 and $to_release <= 4000){
+                    $number = $number * 0.3;
+                }
+                User::where('uid', $user['uid'])->inc('dynamic_integral', $number)->update();
+                UserBill::income('直推奖励释放动态积分', $user['uid'], 'dynamic_integral', 'zt_dynamic_integral', $number, 0, $user['dynamic_integral'] + $number, '直推奖励动态积分');
             }
-            User::where('uid', $user['uid'])->inc('dynamic_integral', $number)->update();
-            UserBill::income('直推奖励释放动态积分', $user['uid'], 'dynamic_integral', 'zt_dynamic_integral', $number, 0, $user['dynamic_integral'] + $number, '直推奖励动态积分');
         }
-
     }
 
 
@@ -791,10 +794,11 @@ class User extends BaseModel
         $order_release = StoreOrderRelease::where([['status', '=', 0], ['create_time', '<', strtotime('today')], ['release_time', '<', strtotime('yesterday')]])->select();
         if ($order_release) {
             foreach ($order_release as $item) {
-                if ($item['already'] + $item['release'] > $item['to_release']) {
+                if ($item['already'] + $item['release'] >= $item['to_release']) {
                     $number = $item['to_release'] - $item['already'];// 释放量
                     $item['already'] += $number;
                     $item['status'] = 1;
+                    User::where('uid', $item['uid'])->dec('shop_number', 1)->update();
                 } else {
                     $number = $item['release'];
                     $item['already'] += $number;

app/models/user/UserSpread.php

@@ -108,7 +108,7 @@ class UserSpread extends BaseModel
                 $user['spread_uid'] = $spread_uid;
                 $user['spread_time'] = time();
                 $consumption = User::where('uid', $spread_uid)->value('consumption');
-                $bill = UserBill::income('推广用户', $spread_uid, 'consumption', 'tg_consumption', 200, '', $consumption+200, '推广用户赠送200消费券');
+                $bill = UserBill::income('推广用户', $spread_uid, 'consumption', 'tg_consumption', 200, '', $consumption+200, '推广用户'.$user['uid'].'赠送200消费券');
                 return $user->save() && User::setUserSpreadCount($spread_uid) && User::where('uid', $spread_uid)->inc('consumption', 200)->update() && $bill;
                 break;
         }