From b128626739056f0fe6f5ee1e8adf67fdb65e66b0 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Wed, 2 Apr 2025 17:07:07 +0800
Subject: [PATCH] adjust

---
 webapp/controller/HangController.class.php   | 25 +++++++++++++++++++-
 webapp/controller/PassController.class.php   | 24 ++++++++++++++++++-
 webapp/controller/RechargeActivity.trait.php |  2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/HangController.class.php b/webapp/controller/HangController.class.php
index bc3d1db..b8c9309 100644
--- a/webapp/controller/HangController.class.php
+++ b/webapp/controller/HangController.class.php
@@ -449,6 +449,29 @@ class HangController{
             die();
             return;
         }
+
+        $shopgoods = metatable\getShopGoodsConf();
+        foreach($shopgoods as $key => $goodsitem) {
+            if ($goodsitem['type'] != 9) {
+                continue;
+            }
+
+            $keyname = 'shop_'.$key;
+            if (array_key_exists($keyname, $passport_reward)) {
+                continue;
+            }
+
+            $passport_reward[$keyname] = array();            
+            $passportawardinfo = $this->getExplode($season_meta_table[$number][$keyname]);
+            foreach($passportawardinfo as $awarditem) {
+                $passport_reward[$keyname][] = array(
+                    'item_id' => $awarditem[0],
+                    'item_num' => $awarditem[1],
+                    'time' => $awarditem[2],
+                    'status' => -1,
+                );
+            }
+        }
         echo json_encode(array(
             'errcode' => 0,
             'errmsg' => '',
@@ -469,7 +492,7 @@ class HangController{
             'daily_first_login' => $rowuser['daily_first_login'] + 1,
             'game_times' => $rowuser['game_times'],
             'min_rank_score' => $min_rank_score,
-            'passport_reward' => count($passport_reward) > 0 ? $passport_reward : (object)array(),
+            'passport_reward' => $passport_reward,
         ));
     }
 }
diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php
index d8a98c5..93f18d0 100644
--- a/webapp/controller/PassController.class.php
+++ b/webapp/controller/PassController.class.php
@@ -210,6 +210,28 @@ class PassController{
             return;
         }
 
+        $shopgoods = metatable\getShopGoodsConf();
+        foreach($shopgoods as $key => $goodsitem) {
+            if ($goodsitem['type'] != 9) {
+                continue;
+            }
+
+            $keyname = 'shop_'.$key;
+            if (array_key_exists($keyname, $passport_reward)) {
+                continue;
+            }
+
+            $passport_reward[$keyname] = array();            
+            $passportawardinfo = $this->getExplode($season_meta_table[$number][$keyname]);
+            foreach($passportawardinfo as $awarditem) {
+                $passport_reward[$keyname][] = array(
+                    'item_id' => $awarditem[0],
+                    'item_num' => $awarditem[1],
+                    'time' => $awarditem[2],
+                    'status' => -1,
+                );
+            }
+        }
 
         echo json_encode(array(
             'errcode' => 0,
@@ -225,7 +247,7 @@ class PassController{
             'week' => $week_reward,
             'seareward' => $sea_reward,
             'min_rank_score' => $min_rank_score,
-            'passport_reward' => count($passport_reward) > 0 ? $passport_reward : (object)array(),
+            'passport_reward' => $passport_reward,
         ));
     }
 
diff --git a/webapp/controller/RechargeActivity.trait.php b/webapp/controller/RechargeActivity.trait.php
index 92f328a..6f814a3 100644
--- a/webapp/controller/RechargeActivity.trait.php
+++ b/webapp/controller/RechargeActivity.trait.php
@@ -568,7 +568,7 @@ trait RechargeActivity
             'id' => $_REQUEST['id'],
             'item_list' => $item_list,
             'all_item_list' => $all_item_list,
-            'first_purchase' => json_encode($firstpurchaseinfo),
+            'first_purchase' => $firstpurchaseinfo,
         ));
     }
 }