|
|
@@ -146,14 +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');
|
|
|
- $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;
|
|
|
+ $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];
|
|
|
}
|