diff --git a/doc/_common.py b/doc/_common.py index ca5b28da..9b716f84 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1447,6 +1447,7 @@ class StakingDetail(object): ['txhash', '', 'txhash'], ['item_id', 0, '道具id'], + ['stacked_num', 0, '质押数量'], ['total_rewards', 0, '该nft已产生的利息'], ['daily_rewards', 0, '该nft每天可以产生多少利息'], ['cec_value', 0, '该nft的价值'], diff --git a/webapp/controller/StakingController.class.php b/webapp/controller/StakingController.class.php index 62530dad..b0bcffcc 100644 --- a/webapp/controller/StakingController.class.php +++ b/webapp/controller/StakingController.class.php @@ -55,17 +55,17 @@ class StakingController extends BaseAuthedController { if ($stakingDto['remain_days'] <= 0) { $stackingInfo['maturity_quant'] += $stakingDto['stacked_num']; } else { - $stackingInfo['daily_rewards'] += $stakingMeta['cec_value'] * - $stakingMeta['daily_rewards']; - $info['daily_staking_value'] += $stakingMeta['cec_value'] * - $stakingMeta['daily_rewards']; + $stackingInfo['daily_rewards'] += $stakingDto['cec_value'] * + $stakingDto['daily_rewards']; + $info['daily_staking_value'] += $stakingDto['cec_value'] * + $stakingDto['daily_rewards']; } $stackingInfo['staked_quant'] += $stakingDto['stacked_num']; - $stackingInfo['staking_value'] += $stakingMeta['stake_value']; + $stackingInfo['staking_value'] += $stakingDto['cec_value']; } else { - $stackingInfo['claim_rewards'] += $stakingMeta['total_rewards']; + $stackingInfo['claim_rewards'] += $stakingDto['total_rewards']; } - $info['total_staking_value'] += $stakingMeta['stake_value'] + $stackingInfo['daily_rewards']; + $info['total_staking_value'] += $stakingDto['cec_value'] + $stackingInfo['daily_rewards']; } } } diff --git a/webapp/models/Staking.php b/webapp/models/Staking.php index 3e1eee3c..dcfe9cbf 100644 --- a/webapp/models/Staking.php +++ b/webapp/models/Staking.php @@ -202,7 +202,9 @@ class Staking extends BaseModel { 'txhash' => $row['txhash'], 'item_id' => $row['item_id'], - 'cec_value' => $stakingMeta['cec_value'] + 'status' => $row['status'], + 'stacked_num' => $row['stacked_num'], + 'cec_value' => $stakingMeta['stake_value'] ); $yesterDay = myself()->_getNowDaySeconds() - 3600 * 24; $passedDays = intval((myself()->_getNowDaySeconds() -