commit

app/api/controller/user/UserController.php

@@ -69,6 +69,9 @@ class UserController
         }elseif (UserEnter::where('uid', $info['uid'])->where('status', 1)->find()){
             $info['is_enter'] = 2;
         }
+        $info['fertilizer'] = UserBill::where('type', 'zccg_white_integral')->where('uid', $info['uid'])->sum('number'); // 补贴肥料
+        $info['sunshine'] = UserBill::where('type', 'zccg_integral')->where('uid', $info['uid'])->sum('number');// 补贴阳光
+        $info['frozen'] = ManyOrder::where('status', 0)->where('uid', $info['uid'])->sum('frozen');// 冻结金额
         $info['purple_integral'] = $info['integral'];
         return app('json')->success($info);
     }
@@ -749,7 +752,7 @@ class UserController
                 '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'),
+                'yesterday_price' =>  UserBill::where('uid', $request->uid())->where('type', 'in', 'jt_white_integral,zt_white_integral,td_white_integral')->sum('number'),
             ];
         }
         return app('json')->success($data);

app/common.php

@@ -648,21 +648,17 @@ if (!function_exists('do_request')) {
     }
 
     if (!function_exists('getParent')){
-        //查找所有上级
-        function getParent($uid){
-            //当前用户
-            static $arr=[];
-            //当前用户
-            $member = getDataFind('user',array('uid'=>$uid));
-            if ($member['spread_uid'] > 0){
-                $parent = getDataFind('user',array('uid'=>$member['spread_uid']));
-
-                $arr[]= $parent['uid'];
+        //获取指定级别的所有上级
+        function getParent($p_id,$array) {
+            $subs=array();
+            foreach($array as $item){
+                if($item['uid'] == $p_id){
+                    $subs[]=$item['uid'];//这里自己看着办，我是获取用户名
+                    $subs=array_merge($subs,getParent($item['spread_uid'],$array));
+                }
 
-                getParent($parent['uid']);
             }
-            return $arr;
-
+            return $subs;
         }
     }
 

app/models/many/ManyOrder.php

@@ -132,7 +132,7 @@ class ManyOrder extends BaseModel
         $many = Many::where('id', $order['many_id'])->find();
         $price = $order['price'];
         if ($find['spread_uid'] > 0 and $price > 0){
-            $spread = getParent($uid, $user->toArray());// 找到所有上级
+            $spread = getParent($find['spread_uid'], $user->toArray());// 找到所有上级
             $v1 = 0;
             $v2 = 0;
             $v3 = 0;

app/models/system/SystemUserTask.php

@@ -283,7 +283,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];
     }
@@ -300,11 +300,10 @@ class SystemUserTask extends BaseModel
     {
         $isComplete = false;
 
-        $user = User::select();
-        $userCount = get_downline($user, $uid);
-        $sumCount = count($userCount);
-        if ($sumCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
-        return ['伞下还需有效账户{$num}天', $sumCount, $isComplete];
+        $user = User::where('spread_uid', $uid)->column('uid');
+        $userCount = User::where('spread_uid', 'in',$user)->where('effective', 1)->count();
+        if ($userCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
+        return ['伞下还需有效账户{$num}天', $userCount, $isComplete];
     }
 
     /**

crmeb/repositories/OrderRepository.php

@@ -125,11 +125,11 @@ class OrderRepository
     public static function storeProductOrderTakeDeliveryAdmin($order)
     {
 
-        $res1 = AdminStoreOrder::gainUserIntegral($order);
+//        $res1 = AdminStoreOrder::gainUserIntegral($order);
 //        $res2 = User::backOrderBrokerage($order);
         $res2 = User::sendBackOrderBrokerage($order);
         AdminStoreOrder::orderTakeAfter($order);
-        if (!($res1 && $res2)) exception('收货失败!');
+        if (!($res2)) exception('收货失败!');
     }
 
     /**
@@ -140,10 +140,10 @@ class OrderRepository
     public static function storeProductOrderTakeDeliveryTimer($order)
     {
 
-        $res1 = AdminStoreOrder::gainUserIntegral($order, false);
+//        $res1 = AdminStoreOrder::gainUserIntegral($order, false);
         $res2 = User::sendBackOrderBrokerage($order);
         AdminStoreOrder::orderTakeAfter($order);
-        if (!($res1 && $res2)) exception('收货失败!');
+        if (!($res2)) exception('收货失败!');
     }