1
This commit is contained in:
parent
d032340c85
commit
28768f302b
@ -26,7 +26,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function getPreSaleInfo()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$presaleInfo = MarketService::getPreSaleInfo($account);
|
||||
if (MarketService::isTestMode()) {
|
||||
foreach(array_keys($presaleInfo) as $key) {
|
||||
@ -42,7 +42,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function searchBox()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$page = getReqVal('page', 1);
|
||||
$type = getReqVal('type', 0);
|
||||
$sort = getReqVal('sort', '');
|
||||
@ -234,7 +234,7 @@ class MarketController extends BaseController {
|
||||
public function queryOrder()
|
||||
{
|
||||
$token = getReqVal('token', '');
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$orderId = getReqVal('order_id', '');
|
||||
if (!MarketService::isValidToken($account, $token)) {
|
||||
myself()->_rspErr(100, 'invalid token');
|
||||
@ -267,7 +267,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function getNftList()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$token = getReqVal('token', '');
|
||||
if (!MarketService::isValidToken($account, $token)) {
|
||||
myself()->_rspErr(100, 'invalid token');
|
||||
@ -286,7 +286,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function getNftDetail()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$token = getReqVal('token', '');
|
||||
$tokenId = getReqVal('token_id', '');
|
||||
if (!MarketService::isValidToken($account, $token)) {
|
||||
@ -310,7 +310,8 @@ class MarketController extends BaseController {
|
||||
$nft = array(
|
||||
'token_id' => $nftDb['token_id'],
|
||||
'owner_address' => $nftDb['owner_address'],
|
||||
'owner_name' => $nftDb['owner_name'],
|
||||
//'owner_name' => $nftDb['owner_name'],
|
||||
'owner_name' => '',
|
||||
'item_id' => $nftDb['item_id'],
|
||||
'currency_list' => array(),
|
||||
'transaction_recrod' => array(),
|
||||
@ -337,7 +338,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function getNonce()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$token = getReqVal('token', '');
|
||||
$nonce = uniqid() . '_' . myself()->_getNowTime();
|
||||
myself()->_rspData(array(
|
||||
@ -348,7 +349,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function tokenAuth()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$token = getReqVal('token', '');
|
||||
if (!MarketService::isValidToken($account, $token)) {
|
||||
myself()->_rspErr(1, 'invalid token');
|
||||
@ -361,7 +362,7 @@ class MarketController extends BaseController {
|
||||
|
||||
public function auth()
|
||||
{
|
||||
$account = getReqVal('account', '');
|
||||
$account = strtolower(getReqVal('account', ''));
|
||||
$tips = getReqVal('tips', '') ;
|
||||
$nonce = getReqVal('nonce', '');
|
||||
$signature = getReqVal('signature', '');
|
||||
|
@ -36,7 +36,7 @@ class MarketBatch {
|
||||
|
||||
public static function getCountdown($meta)
|
||||
{
|
||||
$countdown = max(0, $currBatchMeta['start_time'] - myself()->_getNowTime());
|
||||
$countdown = max(0, $meta['start_time'] - myself()->_getNowTime());
|
||||
return $countdown;
|
||||
}
|
||||
|
||||
|
@ -230,6 +230,11 @@ class MarketService extends BaseService {
|
||||
if (!$buyed) {
|
||||
if ($currBatchMeta['white_list'] &&
|
||||
!mt\WhiteList::inWhiteList($account)) {
|
||||
error_log(json_encode(array(
|
||||
'currBatchMeta' => $currBatchMeta,
|
||||
'white' => mt\WhiteList::inWhiteList($account),
|
||||
'account' => $account
|
||||
)));
|
||||
continue;
|
||||
}
|
||||
array_push($presaleInfo['buyable_list'],
|
||||
|
Loading…
x
Reference in New Issue
Block a user