diff --git a/webapp/mt/HashRateShop.php b/webapp/mt/HashRateShop.php index e7cb3b7b..6a58edba 100644 --- a/webapp/mt/HashRateShop.php +++ b/webapp/mt/HashRateShop.php @@ -25,7 +25,7 @@ class HashRateShop { public static function all() { - return self::$metaList; + return self::getMetaList(); } protected static $metaList; diff --git a/webapp/services/HashRateShopService.php b/webapp/services/HashRateShopService.php index d7aff194..37ab82be 100644 --- a/webapp/services/HashRateShopService.php +++ b/webapp/services/HashRateShopService.php @@ -25,31 +25,33 @@ class HashRateShopService { continue; } $goodsDto = array( - 'goods_id' => $goodsMeta['goods_id'], - 'goods_meta' => self::goodsMetaToInfo($goodsMeta), - 'bought_times' => 0, - 'free_num' => 0, + 'goods_id' => $goodsMeta['id'], + 'item_id' => $goodsMeta['type'], + 'item_num' => $goodsMeta['item_num'], + 'purchased_num' => 0, + 'max_num' => 0, + 'count_down' => 0, ); array_push($goodsList, $goodsDto); switch ($goodsMeta['limit_type']) { case mt\HashRateShop::DAILY_BUY_LIMIT: { - $buyRecord = getXVal($buyRecordHash, $goodsMeta['goods_id']); - $goodsDto['bought_times'] = $buyRecord ? $buyRecord['this_day_buy_times'] : 0; + $buyRecord = getXVal($buyRecordHash, $goodsMeta['id']); + $goodsDto['purchased_num'] = $buyRecord ? $buyRecord['this_day_buy_times'] : 0; } break; case mt\HashRateShop::WEEKLY_BUY_LIMIT: { - $buyRecord = getXVal($buyRecordHash, $goodsMeta['goods_id']); - $goodsDto['bought_times'] = $buyRecord ? $buyRecord['this_week_buy_times'] : 0; + $buyRecord = getXVal($buyRecordHash, $goodsMeta['id']); + $goodsDto['purchased_num'] = $buyRecord ? $buyRecord['this_week_buy_times'] : 0; } break; case mt\HashRateShop::MONTH_BUY_LIMIT: { - $buyRecord = getXVal($buyRecordHash, $goodsMeta['goods_id']); - $goodsDto['bought_times'] = $buyRecord ? $buyRecord['this_week_buy_times'] : 0; + $buyRecord = getXVal($buyRecordHash, $goodsMeta['id']); + $goodsDto['purchased_num'] = $buyRecord ? $buyRecord['this_week_buy_times'] : 0; } break; case mt\HashRateShop::TOTAL_BUY_LIMIT: { - $buyRecord = getXVal($buyRecordHash, $goodsMeta['goods_id']); - $goodsDto['bought_times'] = $buyRecord ? $buyRecord['total_buy_times'] : 0; + $buyRecord = getXVal($buyRecordHash, $goodsMeta['id']); + $goodsDto['purchased_num'] = $buyRecord ? $buyRecord['total_buy_times'] : 0; } break; default: {