Browse Source

fix: change plan refund surplus amount

tokumeikoi 3 years ago
parent
commit
88948eb8ee
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/Services/OrderService.php
  2. 1 1
      app/Services/UserService.php

+ 1 - 1
app/Services/OrderService.php

@@ -202,7 +202,7 @@ class OrderService
             if ($item->cycle === 'onetime_price') continue;
             if ($this->orderIsUsed($item)) continue;
             $orderSurplusMonth = $orderSurplusMonth + self::STR_TO_TIME[$item->cycle];
-            $orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount']);
+            $orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount'] + $item['surplus_amount']);
         }
         if (!$orderSurplusMonth || !$orderSurplusAmount) return;
         $monthUnitPrice = $orderSurplusAmount / $orderSurplusMonth;

+ 1 - 1
app/Services/UserService.php

@@ -55,7 +55,7 @@ class UserService
 
     public function addBalance(int $userId, int $balance):bool
     {
-        $user = User::find($userId);
+        $user = User::lockForUpdate()->find($userId);
         if (!$user) {
             return false;
         }