From 4a29b72e75493fed1f192e29e745a7f5d339d551 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 31 Jul 2023 11:19:47 +0800
Subject: [PATCH] 1

---
 doc/_common.py                  |  1 +
 webapp/services/ShopService.php | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/_common.py b/doc/_common.py
index d040513a..48b8dffc 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -398,6 +398,7 @@ class GoodsInfo(object):
             ['buy_gift', '', '购买次数赠品'],
             ['normal_gift', '', '普通狗赠品'],
             ['free_type', 0, '免费类型 0:不免费 1:日刷新'],
+            ['shop_icon', 0, '商品图标'],
         ]
 
 class Goods(object):
diff --git a/webapp/services/ShopService.php b/webapp/services/ShopService.php
index 96fb5dc2..5c4e8f83 100644
--- a/webapp/services/ShopService.php
+++ b/webapp/services/ShopService.php
@@ -147,7 +147,23 @@ class ShopService {
     public static function goodsMetaToInfo($goodsMeta)
     {
         return array(
-
+            'item_id' => $goodsMeta['item_id'],
+            'item_num' => $goodsMeta['item_num'],
+            'max_amount' => $goodsMeta['max_amount'],
+            'shop_id' => $goodsMeta['shop_id'],
+            'shopstage' => $goodsMeta['shopstage'],
+            'tag' => $goodsMeta['tag'],
+            'recommend' => $goodsMeta['recommend'],
+            'token_type' => $goodsMeta['token_type'],
+            'price' => $goodsMeta['price'],
+            'discount' => $goodsMeta['discount'],
+            'limit_type' => $goodsMeta['limit_type'],
+            'limit_num' => $goodsMeta['limit_num'],
+            'buy_cond' => $goodsMeta['buy_cond'],
+            'buy_gift' => $goodsMeta['buy_gift'],
+            'normal_gift' => $goodsMeta['normal_gift'],
+            'free_type' => $goodsMeta['free_type'],
+            'shop_icon' => $goodsMeta['shop_icon'],
         );
     }