From be53d80523efe1a477c4da6bc5af59edb69061ca Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 13 Jan 2023 10:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=95=86=E5=BA=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/shop/api_getlist.go | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go
index b87ac7d1a..6564bc8aa 100644
--- a/modules/shop/api_getlist.go
+++ b/modules/shop/api_getlist.go
@@ -150,40 +150,39 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 			if tdata > ltime { //达到刷新时间 可以刷新商品列表
 				isrefresh = true
 			}
-			if isrefresh {
-				var _items []*cfg.GameShopitemData
-				for _, v := range shopconf.Shopitem {
-					if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
-						this.module.Error("no founf shopgroup", log.Field{Key: "gid", Value: v})
-						code = pb.ErrorCode_SystemError
-						return
-					}
-					items = append(items, randomGoods(_items))
-				}
-				sdata.Buy = make(map[int32]int32)
-				sdata.LastRefreshTime = configure.Now().Unix()
-				sdata.Items = make([]int32, len(items))
-				sdata.Preview = make(map[int32]*pb.DB_Equipment)
-				for i, v := range items {
-					sdata.Items[i] = v.Key
-					if v.Preview { //是否预览
-						if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); code != pb.ErrorCode_Success {
-							return
-						}
-					}
-				}
-				goods = transGoods(items, sdata)
-				this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
-				this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
-			} else { //返回以前的商品列表
-				if items, err = this.module.configure.GetShopItemsConfigureByIds(sdata.Items...); err != nil {
+		}
+		if isrefresh {
+			var _items []*cfg.GameShopitemData
+			for _, v := range shopconf.Shopitem {
+				if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
+					this.module.Error("no founf shopgroup", log.Field{Key: "gid", Value: v})
 					code = pb.ErrorCode_SystemError
 					return
 				}
-				goods = transGoods(items, sdata)
+				items = append(items, randomGoods(_items))
 			}
+			sdata.Buy = make(map[int32]int32)
+			sdata.LastRefreshTime = configure.Now().Unix()
+			sdata.Items = make([]int32, len(items))
+			sdata.Preview = make(map[int32]*pb.DB_Equipment)
+			for i, v := range items {
+				sdata.Items[i] = v.Key
+				if v.Preview { //是否预览
+					if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); code != pb.ErrorCode_Success {
+						return
+					}
+				}
+			}
+			goods = transGoods(items, sdata)
+			this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
+			this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
+		} else { //返回以前的商品列表
+			if items, err = this.module.configure.GetShopItemsConfigureByIds(sdata.Items...); err != nil {
+				code = pb.ErrorCode_SystemError
+				return
+			}
+			goods = transGoods(items, sdata)
 		}
-
 	} else {
 		code = pb.ErrorCode_ReqParameterError
 		return