From 6d90ad84d791140d60037613fa8e36bdd7dea873 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 2 Aug 2023 11:18:20 +0800
Subject: [PATCH] 1

---
 webapp/controller/ShopController.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index d79bf6b4..8aab3166 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -221,7 +221,7 @@ class ShopController extends BaseAuthedController {
 
     public function queryInAppBalance()
     {
-        myself()-_rspData(
+        myself()->_rspData(
             array(
                 'balance' => $this->getInAppBalance()
             )
@@ -424,7 +424,11 @@ class ShopController extends BaseAuthedController {
     {
         $recordDb = InAppRecord::get();
         $upLimit = mt\Parameter::getVal('inapp_up_limit', 0);
-        return max(0, $recordDb ? $upLimit - $recordDb['amount'] : 0);
+        $todayAmount = 0;
+        if ($recordDb) {
+            $todayAmount = max($recordDb['amount'], $recordDb['amount_ok']);
+        }
+        return max(0, $upLimit - $todayAmount);
     }
 
 }