commit

app/api/controller/AuthController.php

@@ -253,6 +253,9 @@ class AuthController
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');
+        if (!$spread) return app('json')->fail('请填写推荐码');
+        if (!User::where('uid', $spread)->find()) return app('json')->fail('推荐人不存在');
+
         $registerStatus = User::register($account, $password, $spread, $payment_pas);
         if ($registerStatus) return app('json')->success('注册成功');
         return app('json')->fail(User::getErrorInfo('注册失败'));

app/api/controller/user/UserController.php

@@ -706,23 +706,31 @@ class UserController
         $user = User::select();
         $userId = get_downline_dow($user, $request->uid());
         $data = [
-            'count' => 0,
+            'direct_push' => [],
+            'direct_push_count' => 0,
+            'between' => [],
+            'between_count' => 0,
             'user_list' => [],
-            'user_price' => 0
+            'user_count' => 0,
+            'price' => 0,
+            'today_price' => 0,
+            'yesterday_price' => 0
         ];
         if (count($userId) > 0){
-            $count = count($userId);
-            $userList = User::where('uid', 'in', $userId)
-                ->field('uid,nickname,avatar,add_time')
-                ->select();
-            foreach ($userList as &$item){
-                $item['price'] =  ManyOrder::where('uid', $item['uid'])->where('status', 1)->sum('price');
-            }
-            $userPrice = ManyOrder::where('uid', 'in', $userId)->where('status', 1)->sum('price');
+            $user1 = User::field('uid,nickname,avatar,add_time,phone')->where('spread_uid', '=', $request->uid())->select();
+            $uids = User::field('uid,nickname,avatar,add_time,phone')->where('spread_uid', '=', $request->uid())->column('uid');
+            $user2 = User::field('uid,nickname,avatar,add_time,phone')->where('spread_uid', 'in', $uids)->select();
+            $use_list =  User::field('uid,nickname,avatar,add_time,phone')->where('uid', 'in', $userId)->select();
             $data = [
-                'count' => $count,
-                'user_price' => $userPrice,
-                'user_list' => $userList
+                'direct_push' => $user1,
+                'direct_push_count' => count($user1),
+                'between' => $user2,
+                'between_count' => count($user2),
+                'user_list' => $use_list,
+                'user_count' => count($use_list),
+                'price' =>  ManyOrder::where('uid', 'in', $userId)->where('status', 1)->whereBetweenTime('create_time', strtotime(date('Y-m-1')), strtotime('next month'))->sum('price'),
+                'today_price' =>  ManyOrder::where('uid', 'in', $userId)->where('status', 1)->whereBetweenTime('create_time', strtotime('today'), strtotime('tomorrow'))->sum('price'),
+                'yesterday_price' =>  ManyOrder::where('uid', 'in', $userId)->where('status', 1)->whereBetweenTime('create_time', strtotime('yesterday'), strtotime('today'))->sum('price'),
             ];
         }
         return app('json')->success($data);

app/models/user/UserExtract.php

@@ -130,14 +130,14 @@ class UserExtract extends BaseModel
         try{
             $res1 = self::create($insertData);
             if(!$res1) return self::setErrorInfo('提现失败');
-            if ($userInfo['purple_integral'] > 0){
+            if ($userInfo['integral'] > 0){
                 if($dk > $sxf){
-                    $res2 = User::edit([$bl => $balance, 'purple_integral' => $ydk],$userInfo['uid'],'uid');
+                    $res2 = User::edit([$bl => $balance, 'integral' => $ydk],$userInfo['uid'],'uid');
                     UserBill::expend('提现抵扣',$userInfo['uid'],'integral','extract',($sxf*$tx),$res1['id'],$ydk,'提现使用'.($sxf*$tx).'阳光抵扣'.$sxf.'手续费');
 
                 }else{
-                    $res2 = User::edit([$bl => $balance, 'purple_integral' => $ydk],$userInfo['uid'],'uid');
-                    UserBill::expend('提现抵扣',$userInfo['uid'],'integral','extract',(($sxf - $dk)*$tx),$res1['id'],$ydk,'提现使用'.(($sxf - $dk)*$tx).'阳光抵扣'.($sxf - $dk).'手续费');
+                    $res2 = User::edit([$bl => $balance, 'integral' => $ydk],$userInfo['uid'],'uid');
+                    UserBill::expend('提现抵扣',$userInfo['uid'],'integral','extract',($dk*$tx),$res1['id'],$ydk,'提现使用'.($dk*$tx).'阳光抵扣'.$dk.'手续费');
                 }
 
             }else{

route/api/route.php

@@ -180,6 +180,7 @@ Route::group(function () {
 
     //投注订单
     Route::get('many_order/list', 'many.ManyOrderController/order')->name('many_order');//投注订单
+    Route::get('dow', 'user.UserController/dow')->name('dow');// 团队人数流水
     //绿卡记录
     Route::get('green/list', 'many.ManyGreenController/list')->name('green');//绿卡记录
     Route::post('green/exchange', 'many.ManyGreenController/exchange')->name('exchange');//绿卡兑换