diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 269b1192..bf13b534 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -472,11 +472,14 @@ class ShopController extends BaseAuthedController {
         $totalAmount = InAppRecord::getTotalAmount();
         $recordDb = InAppRecord::get();
         $upLimit = mt\Parameter::getVal('inapp_daily_up_limit', 0);
+        $totalUpLimit = mt\Parameter::getVal('inapp_total_up_limit', 0);
         $todayAmount = 0;
         if ($recordDb) {
             $todayAmount = max($recordDb['amount'], $recordDb['amount_ok']);
         }
-        return max(0, $upLimit - $todayAmount);
+        $dailyBalance = max(0, $upLimit - $todayAmount);
+        $totalBalance = max(0, $totalUpLimit - $totalAmount);
+        return min($dailyBalance, $totalBalance);
     }
 
 }