From d3d1a680d420f6daba4fec5b6014e0950a70af26 Mon Sep 17 00:00:00 2001
From: songliang <songliang@kingsome.cn>
Date: Sun, 16 Jul 2023 16:19:47 +0800
Subject: [PATCH 1/2] ...

---
 third_party/phpcommon                           | 2 +-
 webapp/services/callback/ShopBuyGoodsDirect.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/phpcommon b/third_party/phpcommon
index 1913ff11..214a4377 160000
--- a/third_party/phpcommon
+++ b/third_party/phpcommon
@@ -1 +1 @@
-Subproject commit 1913ff111893e9583dff228c9bc24669ec2e86b0
+Subproject commit 214a4377c3688c70e9a6ceb0b3495fb4aaec7507
diff --git a/webapp/services/callback/ShopBuyGoodsDirect.php b/webapp/services/callback/ShopBuyGoodsDirect.php
index 8f4f08d2..e4a3ea89 100644
--- a/webapp/services/callback/ShopBuyGoodsDirect.php
+++ b/webapp/services/callback/ShopBuyGoodsDirect.php
@@ -68,7 +68,7 @@ class ShopBuyGoodsDirect
 
         $conn = myself()->_getMysql('');
 
-        $order = SqlHelper::selectOne($conn, 't_shop_buy_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('idx' => $order_id));
+        $order = SqlHelper::selectOne($conn, 't_shop_buy_order', array('address', 'id', 'item_id', 'goods_num', 'status'), array('order_id' => $order_id));
         if (!$order) {
             $this->_rspErr(2, "order not found: {$order_id}");
             return;

From 64ea33df3b33bc378b5fd9500c3a1a1a6f21a2ad Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Sun, 16 Jul 2023 19:16:28 +0800
Subject: [PATCH 2/2] 1

---
 webapp/models/Hero.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 781f1f13..f6fc0b40 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -684,8 +684,6 @@ class Hero extends BaseModel {
             myself()->_getNowDaySeconds()) {
             $todayPveGetCeg = 0;
         }
-
-        $heroLucky = \services\FormulaService::Hero_Advanced_Lucky_Value($row['quality']);
         $info = array(
             'idx' => $row['idx'],
             'token_id' => $row['token_id'],
@@ -699,15 +697,8 @@ class Hero extends BaseModel {
             'current_pvp_get_ceg' => $todayGetGold / 100,
             'current_pve_get_ceg' => $todayPveGetCeg / 100,
             'advanced_count' => $row['advanced_count'],
-            'lucky' => strval($heroLucky),
-            'chip_ids' => $row['chip_ids'],
-            'chip_strength_sum' => strval(Chip::getChipMaxStrength($row['chip_ids'],1)), //计算ceg上限所需参数
-            'skill_points' => $row['skill_points'],
-            'labour' => $row['labour'],
         );
-        $info['hero_tili_max'] = strval(round(FormulaService::Hero_NFT_Maximum_Physical_Strength($info['quality'],$info['lucky']),3));
-        $info['pvp_ceg_uplimit'] =strval( round(FormulaService::getHeroPvpDailyCegUpLimit($info),2) );
-        $info['pve_ceg_uplimit'] = strval( round(FormulaService::getHeroPveDailyCegUpLimit($info),2) );
+
         return $info;
     }