1

app/api/controller/user/UserController.php

@@ -111,6 +111,8 @@ class UserController
         }
         $info['level_name'] = SystemUserLevel::where('id', $info['level'])->value('name');
         $info['group_level_name'] = SystemGroupLevel::where('id', $info['group_level'])->value('name');
+//        等级任务
+        SystemUserLevel::getLevelList($info['uid']);
         return app('json')->success($info);
     }
 

app/models/system/SystemUserTask.php

@@ -136,7 +136,7 @@ class SystemUserTask extends BaseModel
     }
 
     /**
-     * 累计消费金额
+     * 累计消费金额(包括直推下级)
      * @param int $task_id 任务id
      * @param int $uid 用户id
      * @param int $start_time 开始时间
@@ -146,7 +146,14 @@ class SystemUserTask extends BaseModel
     public static function ConsumptionAmount($task_id, $uid = 0, $start_time = 0, $number = 0)
     {
         $isComplete = false;
-        $SumPayPrice = StoreOrder::where('paid', 1)->where('refund_status', 0)->where('is_del', 0)->where('uid', $uid)->where('add_time', '>', $start_time)->sum('pay_price');
+//        $SumPayPrice = StoreOrder::where('paid', 1)->where('refund_status', 0)->where('is_del', 0)->where('uid', $uid)->where('add_time', '>', $start_time)->sum('pay_price');
+        $directSubordinateUids = User::where('spread_uid', $uid)->column('uid');
+        $personal_achievement = 0;
+        if (!empty($directSubordinateUids)) {
+            $personal_achievement = User::whereIn('uid', $directSubordinateUids)
+                ->sum('achievement');
+        }
+        $SumPayPrice =$personal_achievement;
         if ($SumPayPrice >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
         return ['还需消费{$num}元', $SumPayPrice, $isComplete];
     }