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); } }