From 3de5d28570a9c2cf4acb2ac669929b459cd29acc Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Tue, 8 Nov 2022 21:35:35 +0800
Subject: [PATCH 1/2] update FormulaService

---
 webapp/services/FormulaService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 36069613..f337febb 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -342,7 +342,7 @@ class FormulaService extends BaseService {
                        ROUND(1-($heroTopX/10-1)/9,2) * 0.03  +
                        ROUND(1-($weaponTopX/10-1)/9,2) * 0.02;
         //不同段位的及格分 = ROUND(1-(大段位排名-1)/(MAX(10)-1),2)
-        $topRanking = mt\Rank::getRankById($userDb['rank'])['rank_order'];    //**************  rankRank 参数表获取 ************
+        $topRanking = mt\Rank::getRankById($userDb['rank'])?mt\Rank::getRankById($userDb['rank'])['rank_order']:0;    //**************  rankRank 参数表获取 ************
         $askedScore = round(1-($topRanking-1)/(10-1),2);
         //一个玩家的赛后积分 = 赛前积分+K*(胜负率-总胜率)+2K*(表现分-段位要求的及格分)
         $meta2 = mt\Parameter::getByName('rank_k');

From 7280473f9e112c8103c44f055b112e88f7aeafb3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 9 Nov 2022 00:12:51 +0800
Subject: [PATCH 2/2] 1

---
 webapp/controller/BlockChainController.class.php | 13 +++++++------
 webapp/models/Gun.php                            |  3 +++
 webapp/models/Transaction.php                    |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index a97af43c..49bf3bd0 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -412,6 +412,7 @@ class BlockChainController extends BaseAuthedController {
         $chipIds = explode('|', getReqVal('chip_ids', ''));
         $slotIds = explode('|', getReqVal('slot_ids', ''));
 
+        error_log(json_encode($_REQUEST));
         if (count($chipIds) != count($slotIds) ||
             count($chipIds) < 0) {
             myself()->_rspErr(101, 'chip_ids paramater error');
@@ -450,7 +451,7 @@ class BlockChainController extends BaseAuthedController {
                     'action' => Transaction::PLUGIN_CHIP_ACTION_TYPE,
                     'tokenId' => $tokenId,
                     'tokenType' => Nft::HERO_TYPE,
-                    'itemUniId' => $heroDb['chip_uniid'],
+                    'itemUniId' => $heroDb['hero_uniid'],
                     'itemId' => $heroDb['item_id']
                 )
             );
@@ -488,8 +489,8 @@ class BlockChainController extends BaseAuthedController {
                     'action' => Transaction::PLUGIN_CHIP_ACTION_TYPE,
                     'tokenId' => $tokenId,
                     'tokenType' => Nft::EQUIP_TYPE,
-                    'itemUniId' => $gunDb['chip_uniid'],
-                    'itemId' => $gunDb['item_id']
+                    'itemUniId' => $gunDb['gun_uniid'],
+                    'itemId' => $gunDb['gun_id']
                 )
             );
         }
@@ -546,7 +547,7 @@ class BlockChainController extends BaseAuthedController {
                     'action' => Transaction::UNPLUG_CHIP_ACTION_TYPE,
                     'tokenId' => $tokenId,
                     'tokenType' => Nft::HERO_TYPE,
-                    'itemUniId' => $heroDb['chip_uniid'],
+                    'itemUniId' => $heroDb['hero_uniid'],
                     'itemId' => $heroDb['item_id']
                 )
             );
@@ -584,8 +585,8 @@ class BlockChainController extends BaseAuthedController {
                     'action' => Transaction::UNPLUG_CHIP_ACTION_TYPE,
                     'tokenId' => $tokenId,
                     'tokenType' => Nft::EQUIP_TYPE,
-                    'itemUniId' => $gunDb['chip_uniid'],
-                    'itemId' => $gunDb['item_id']
+                    'itemUniId' => $gunDb['gun_uniid'],
+                    'itemId' => $gunDb['gun_id']
                 )
             );
         }
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index ba0d80a1..91b69ad1 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -261,6 +261,9 @@ class Gun extends BaseModel {
         $dto['pvp_ceg_uplimit'] = strval( round(FormulaService::getWeaponPvpDailyCegUpLimit($dto),2) );
         $dto['pve_ceg_uplimit'] = strval( round(FormulaService::getWeaponPveDailyCegUpLimit($dto),2) );
         $dto['mission_ceg_uplimit'] = strval( round(FormulaService::getWeaponMissionDailyCegUpLimit($dto),2) );
+        error_log(json_encode(array(
+            'data____info'=>$dto
+        ))) ;
         return $dto;
     }
 
diff --git a/webapp/models/Transaction.php b/webapp/models/Transaction.php
index f343744d..df598f8f 100644
--- a/webapp/models/Transaction.php
+++ b/webapp/models/Transaction.php
@@ -117,12 +117,12 @@ class Transaction extends BaseModel {
         case self::CREATED_STATUS:
         case self::REPORTED_STATUS:
         {
-            return 'Pending';
+            return 2;
         }
         break;
         case self::COMPLETED_STATUS:
         {
-            return 'Complete';
+            return 1;
         }
         break;
         default: