1

app/models/system/SystemUserTask.php

@@ -282,8 +282,10 @@ class SystemUserTask extends BaseModel
         $isComplete = false;
         $group_users = \app\admin\model\user\User::get_group_user($uid);
         $achievement1 = \app\admin\model\order\StoreOrder::where('uid','in', $group_users)->where('paid', 1)->whereNotIn('status',[-1])->sum('pay_price');
-        if ($achievement1 >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
-        return ['还需消费{$num}元', $achievement1, $isComplete];
+        $achievement2 = \app\admin\model\order\StoreOrder::where('uid','in', $group_users)->where('is_brokerage',1)->where('paid', 1)->whereNotIn('status',[-1])->sum('use_integral');
+        $achievement= bcadd($achievement1, $achievement2, 2);
+        if ($achievement >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
+        return ['还需消费{$num}元', $achievement, $isComplete];
     }
     /**
      * 邀请好友成为代理商(等级2)

app/models/user/User.php

@@ -514,7 +514,9 @@ class User extends BaseModel
         $group_users = \app\admin\model\user\User::get_group_user($uid);
 //        $achievement1 = \app\admin\model\order\StoreOrder::where('uid','in', $group_users)->where('paid', 1)->whereNotIn('status',-1)->sum('pay_price');
         $achievement1 = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->whereNotIn('status',[-1])->sum('pay_price');
-        return $achievement1;
+        $achievement2 = \app\admin\model\order\StoreOrder::where('uid','in', $group_users)->where('is_brokerage',1)->where('paid', 1)->whereNotIn('status',[-1])->sum('use_integral');
+        $achievement= bcadd($achievement1, $achievement2, 2);
+        return $achievement;
     }
     /**
      * 获取用户下级推广人