diff --git a/doc/ComputingPower.py b/doc/ComputingPower.py index 5ed0a556..35330edf 100644 --- a/doc/ComputingPower.py +++ b/doc/ComputingPower.py @@ -8,7 +8,7 @@ class ComputingPower(object): self.apis = [ { 'name': 'info', - 'desc': 'huoq ', + 'desc': '获取算力信息', 'group': 'ComputingPower', 'url': 'webapp/index.php?c=ComputingPower&a=info', 'params': [ @@ -16,7 +16,83 @@ class ComputingPower(object): ], 'response': [ _common.RspHead(), - ['!item_list', [_common.Item()], '物品列表'] + ['info', _common.ComputingPower(), '算力信息'] + ] + }, + { + 'name': 'exchangePower', + 'desc': '', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=exchangePower', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ] + }, + { + 'name': 'exchangeCrystal', + 'desc': '', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=exchangeCrystal', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ] + }, + { + 'name': 'getCrystalUiInfo', + 'desc': '获取算力信息', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=getCrystalUiInfo', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ['info', _common.ComputingPower(), '算力信息'] + ] + }, + { + 'name': 'getRewardHistorys', + 'desc': '获取算力信息', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=getRewardHistorys', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ['info', _common.ComputingPower(), '算力信息'] + ] + }, + { + 'name': 'getExchangeCrystalHistorys', + 'desc': '获取算力信息', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=getExchangeCrystalHistorys', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ['info', _common.ComputingPower(), '算力信息'] + ] + }, + { + 'name': 'getExchangePowerHistorys', + 'desc': '获取算力信息', + 'group': 'ComputingPower', + 'url': 'webapp/index.php?c=ComputingPower&a=getExchangePowerHistorys', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ['info', _common.ComputingPower(), '算力信息'] ] }, ] diff --git a/doc/_common.py b/doc/_common.py index 6d293429..a1bbcc6e 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1324,3 +1324,43 @@ class MallGoods(object): ['cancel_countdown', 0, '可下架时间倒计时:-1不可下架'], ['modify_countdown', 0, '可修改价格倒计时:-1不可修改价格'], ] + +class ComputingPowerSelf(object): + + def __init__(self): + self.fields = [ + ['exchange_hash_rate', '', "选用币种 目前只支持CEG USDC USDT"], + ] + +class ComputingPowerCurr(object): + + def __init__(self): + self.fields = [ + ['period_begin', '', ''], + ['period_end', '', '商品唯一id'], + ['assignable_cec', '', '出售方账号'], + + ['total_target', '', '出售方钱包地址'], + ['total_hash_rate', '', '商品道具id'], + ['refresh_remain_time', '', '道具数量'], + ['total_exchange_hash_rate', '', "选用币种 目前只支持CEG USDC USDT"], + ] + +class ComputingPowerLast(object): + + def __init__(self): + self.fields = [ + ['period_begin', '', ''], + ['period_end', '', '商品唯一id'], + ['period_reward', '', '商品唯一id'], + ['clamid', '', ''], + ] + +class ComputingPower(object): + + def __init__(self): + self.fields = [ + ['curr_period', ComputingPowerCurr(), ''], + ['curr_self', ComputingPowerSelf(), ''], + ['last_period', ComputingPowerLast(), '商品唯一id'], + ] diff --git a/webapp/controller/FirstTopupController.class.php b/webapp/controller/FirstTopupController.class.php index 391dd9d9..f9f55bdf 100644 --- a/webapp/controller/FirstTopupController.class.php +++ b/webapp/controller/FirstTopupController.class.php @@ -75,8 +75,8 @@ class FirstTopupController extends BaseAuthedController { for ($i = 0; $i < count($reward); $i++) { array_push($awardItems, array( - 'item_id' => $item['goods_id'], - 'item_num' => $item['goods_num'] + 'item_id' => $reward[$i]['goods_id'], + 'item_num' => $reward[$i]['goods_num'] )); } myself()->_addItems($awardItems, $awardService, $propertyChgService);