diff --git a/doc/Staking.py b/doc/Staking.py index d3068b35..90a515a3 100644 --- a/doc/Staking.py +++ b/doc/Staking.py @@ -16,8 +16,8 @@ class Staking(object): ], 'response': [ _common.RspHead(), - ['total_staking_value', '', '质押总ceg价值'], - ['daily_staking_value', '', '当天总ceg价值'], + ['total_staking_value', '', '质押总ceg价值,包含利息'], + ['daily_staking_value', '', '当天总ceg价值,包含利息'], ['planet', _common.Staking(), '星球质押'], ['badge', _common.Staking(), '徽章质押'], ['cec', _common.Staking(), 'cec质押'], diff --git a/webapp/controller/StakingController.class.php b/webapp/controller/StakingController.class.php index 13e331f0..c83cbcc8 100644 --- a/webapp/controller/StakingController.class.php +++ b/webapp/controller/StakingController.class.php @@ -46,17 +46,20 @@ class StackingController extends BaseAuthedController { $stackingInfo['staking_value'] = 0; $stackingInfo['maturity_quant'] = 0; foreach ($rows as $row) { - if ($this->isTypeNft($stackingInfo['type'], $row) && - $row['status'] == Stacking::STAKING_STATUS) { - if ($row['start_time'] + $row['stake_time'] < myself()->_getNowTime()) { - $stackingInfo['staked_quant'] += $row['stacked_num']; - } else { - $stackingInfo['maturity_quant'] += $row['stacked_num']; - } + if ($this->isTypeNft($stackingInfo['type'], $row)) { $stakingMeta = mt\Staking::get($row['item_id']); - if ($stakingMeta) { - $stackingInfo['staking_value'] += $stakingMeta['stake_value']; - $info['total_staking_value'] += $stakingMeta['stake_value']; + if ($row['status'] == Stacking::STAKING_STATUS) { + if ($row['start_time'] + $row['stake_time'] < myself()->_getNowTime()) { + $stackingInfo['staked_quant'] += $row['stacked_num']; + } else { + $stackingInfo['maturity_quant'] += $row['stacked_num']; + } + if ($stakingMeta) { + $stackingInfo['staking_value'] += $stakingMeta['stake_value']; + $info['total_staking_value'] += $stakingMeta['stake_value']; + } + + } else { } } }