commit

app/models/store/StoreOrder.php

@@ -783,12 +783,12 @@ class StoreOrder extends BaseModel
         UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元购买商品');
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);
-        $order_price = self::where('uid', $order['uid'])->sum('pay_price');
+        $order_price = self::where('uid', $order['uid'])->where('paid', 1)->sum('pay_price');
 
         $x = 10000 * floor($order_price/10000);
         if ($x > 0){
-            if (!UserBonus::where('uid', $order['uid'])->where('integral', $x)->find()){
-                $py = UserBonus::where('uid', $order['uid'])->sum('integral');
+            $py = UserBonus::where('uid', $order['uid'])->sum('integral');
+            if (!UserBonus::where('uid', $order['uid'])->where('integral', $x)->find() and $x - $py > 0){
                 UserBonus::create([
                     'uid' => $order['uid'],
                     'integral' => $x - $py,

app/models/system/SystemUserTask.php

@@ -261,6 +261,8 @@ class SystemUserTask extends BaseModel
         $isComplete = false;
         $uids = get_downline(User::select(), $uid);
         $sumCount = StoreOrder::where('uid', 'in', $uids)->where('paid', 1)->sum('number');
+        $Count = StoreOrder::where('uid', $uid)->where('paid', 1)->sum('number');
+        $sumCount += $Count;
         if ($sumCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
         return ['还需签到{$num}天', $sumCount, $isComplete];
     }