diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index ef5729af..e0f05243 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -24,14 +24,6 @@ use services\MarketService; class MarketController extends BaseController { - const CURRENCY_DECIMALS = 8; - const PRICE_PAD = '0000000000'; - - const PRESALE_NOT_STARTED = 0; - const PRESALE_PREPARE = 1; - const PRESALE_STARTED = 2; - const PRESALE_SOLD_OUT = 3; - public function getPreSaleInfo() { $account = getReqVal('account', ''); @@ -50,16 +42,16 @@ class MarketController extends BaseController { $buyed = MarketService::isTestMode() ? 0 : BoxOrder::isBuyed($account, $currBatchMeta['id']); $title = ''; - $state = self::PRESALE_PREPARE; + $state = MarketService::PRESALE_PREPARE; if ($countdown > 0) { - $state = self::PRESALE_PREPARE; + $state = MarketService::PRESALE_PREPARE; } else { if ($soldNum >= $totalNum) { $title = $this->escapeString($currBatchMeta['end_title']); - $state = self::PRESALE_SOLD_OUT; + $state = MarketService::PRESALE_SOLD_OUT; } else { $title = $this->escapeString($currBatchMeta['begin_title']); - $state = self::PRESALE_STARTED; + $state = MarketService::PRESALE_STARTED; } } $presaleInfo = array( @@ -142,7 +134,7 @@ class MarketController extends BaseController { myself()->_rspErr(500, 'server internal error'); return; } - $originalPrice = $meta['price'] * pow(10, self::CURRENCY_DECIMALS); + $originalPrice = $meta['price'] * pow(10, MarketService::CURRENCY_DECIMALS); $discountPrice = $meta['discount'] * 100 > 0 ? $originalPrice * $meta['discount'] : $originalPrice; $saleBox = array( @@ -157,7 +149,7 @@ class MarketController extends BaseController { 'original_price' => $originalPrice, 'discount_price' => $discountPrice, 'discount_rate' => $meta['discount'], - 'decimals' => self::CURRENCY_DECIMALS, + 'decimals' => MarketService::CURRENCY_DECIMALS, 'contract_address' => $currencyMeta['address'], ) ) @@ -237,11 +229,11 @@ class MarketController extends BaseController { myself()->_rspErr(500, 'not white list user'); return; } - $originalPrice = $goodsMeta['price'] * pow(10, self::CURRENCY_DECIMALS); + $originalPrice = $goodsMeta['price'] * pow(10, MarketService::CURRENCY_DECIMALS); $discountPrice = $goodsMeta['discount'] * 100 > 0 ? $originalPrice * $goodsMeta['discount'] : $originalPrice; - $discountPrice .= self::PRICE_PAD; + $discountPrice .= MarketService::PRICE_PAD; error_log('price:' . $price . ' discountPrice:' . $discountPrice); if (!$discountPrice || strcmp($price, $discountPrice) != 0) { myself()->_rspErr(500, 'price error'); @@ -463,7 +455,7 @@ class MarketController extends BaseController { 'countdown' => 0, 'sold_num' => 0, 'total_num' => 0, - 'state' => self::PRESALE_NOT_STARTED, + 'state' => MarketService::PRESALE_NOT_STARTED, 'title' => $title, 'hint' => $hint, 'buyable_list' => array(), diff --git a/webapp/services/MarketService.php b/webapp/services/MarketService.php index 56678638..680cc3b9 100644 --- a/webapp/services/MarketService.php +++ b/webapp/services/MarketService.php @@ -6,6 +6,14 @@ require_once('mt/Parameter.php'); class MarketService extends BaseService { + const CURRENCY_DECIMALS = 8; + const PRICE_PAD = '0000000000'; + + const PRESALE_NOT_STARTED = 0; + const PRESALE_PREPARE = 1; + const PRESALE_STARTED = 2; + const PRESALE_SOLD_OUT = 3; + const TOKEN_SALT = 'B8E6BD4F-FD7B-E2B8-6688-80A2D8632064'; public static function isTestMode()