Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

This commit is contained in:
hujiabin 2024-06-19 16:27:44 +08:00
commit 3d5b9a2d63

View File

@ -130,28 +130,26 @@ class BlockChainController extends BaseAuthedController {
return; return;
} }
$isMint = true; $isMint = true;
$tokenId = $heroDb['token_id'];
if ($heroDb['token_id'] && $heroDb['activate']) { if ($heroDb['token_id'] && $heroDb['activate']) {
$isMint = false; $isMint = false;
} else { } else if (empty($tokenId) ){
$tokenId = $heroDb['token_id']; $tokenId = BuyRecord::genOrderId
if (!$tokenId) { (
$tokenId = BuyRecord::genOrderId GAME_ID,
( phpcommon\BC_FUNC_CREATION,
GAME_ID, myself()->_getNowTime(),
phpcommon\BC_FUNC_CREATION, myself()->_getAddress()
myself()->_getNowTime(), );
myself()->_getAddress() Hero::safeUpdateTokenId($heroDb['hero_uniid'], $tokenId);
); $heroDb = Hero::find($uniid);
Hero::safeUpdateTokenId($heroDb['hero_uniid'], $tokenId); if (!$heroDb) {
$heroDb = Hero::find($uniid); myself()->_rspErr(1, 'hero not found');
if (!$heroDb) { return;
myself()->_rspErr(1, 'hero not found'); }
return; if ($heroDb['token_id'] != $tokenId) {
} myself()->_rspErr(500, 'server internal error');
if ($heroDb['token_id'] != $tokenId) { return;
myself()->_rspErr(500, 'server internal error');
return;
}
} }
} }
$this->internalActivate721Nft($tokenId, $this->internalActivate721Nft($tokenId,
@ -277,6 +275,7 @@ class BlockChainController extends BaseAuthedController {
'is_mint' => $isMint ? 1 : 0, 'is_mint' => $isMint ? 1 : 0,
'net_id' => NET_ID 'net_id' => NET_ID
); );
error_log(json_encode($params));
{ {
$url = self::getWeb3ServiceUrl(); $url = self::getWeb3ServiceUrl();
$response = ''; $response = '';