This commit is contained in:
aozhiwei 2023-08-02 11:18:20 +08:00
parent 066ce6bc9b
commit 6d90ad84d7

View File

@ -221,7 +221,7 @@ class ShopController extends BaseAuthedController {
public function queryInAppBalance() public function queryInAppBalance()
{ {
myself()-_rspData( myself()->_rspData(
array( array(
'balance' => $this->getInAppBalance() 'balance' => $this->getInAppBalance()
) )
@ -424,7 +424,11 @@ class ShopController extends BaseAuthedController {
{ {
$recordDb = InAppRecord::get(); $recordDb = InAppRecord::get();
$upLimit = mt\Parameter::getVal('inapp_up_limit', 0); $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);
} }
} }