From c3d4fdc78476adb6be1f3a5788a955efdade5226 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 20 Nov 2024 16:36:32 +0800
Subject: [PATCH] 1

---
 server/wheelserver/api/v1/bag/bag.go | 37 +++++++++-------------------
 server/wheelserver/vo/bagitem.go     | 18 ++++++++++++++
 2 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 server/wheelserver/vo/bagitem.go

diff --git a/server/wheelserver/api/v1/bag/bag.go b/server/wheelserver/api/v1/bag/bag.go
index 4c2e86bc..27af9718 100644
--- a/server/wheelserver/api/v1/bag/bag.go
+++ b/server/wheelserver/api/v1/bag/bag.go
@@ -7,7 +7,7 @@ import (
 	"main/common"
 	"main/model"
 	"main/vo"
-	"main/mt"
+	"main/service"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,35 +19,20 @@ func (this *BagApi) List(c *gin.Context) {
 	if s == nil {
 		return
 	}
-	user := new(model.User)
-	rspObj := struct {
-		vo.BaseVo
-		UserInfo vo.User `json:"user_info"`
-	}{}
-	nowTime := f5.GetApp().GetRealSeconds()
-	if err, found := user.Find(s.GetAccountId(), nowTime); err != nil  {
+	err, items := service.Bag.List(s.GetAccountId())
+	if err != nil {
 		f5.RspErr(c, 500, "server internal error")
 		return
-	} else if !found {
-		user.AccountId = s.GetAccountId()
-		user.Avatar = ""
-		user.NickName = s.GetNickName()
-		user.Score = 0
-		user.Dice = mt.Table.Global.GetDailyDiceNum()
-		user.LastPresentDiceTime = q5.ToInt32(nowTime)
-		user.CreateTime = q5.ToInt32(nowTime)
-		user.ModifyTime = q5.ToInt32(nowTime)
-		if user.Create() != nil {
-			f5.RspErr(c, 500, "server internal error")
-			return
-		}
-		f5.GetMsgQueue().FireEvent(constant.MSG_CREATE_USER, q5.Args{user})
 	}
-	if user.NickName != s.GetNickName() {
-		user.UpdateName()
+	rspObj := struct {
+		vo.BaseVo
+		Data []*vo.BagItem `json:"data"`
+	}{}
+	for _, m := range items {
+		v := new(vo.BagItem)
+		v.FromModel(m)
+		q5.AppendSlice(&rspObj.Data, v)
 	}
-	f5.GetMsgQueue().FireEvent(constant.MSG_LOGIN, q5.Args{user})
-	rspObj.UserInfo.FromModel(user)
 	c.JSON(200, rspObj)
 }
 
diff --git a/server/wheelserver/vo/bagitem.go b/server/wheelserver/vo/bagitem.go
new file mode 100644
index 00000000..53319358
--- /dev/null
+++ b/server/wheelserver/vo/bagitem.go
@@ -0,0 +1,18 @@
+package vo
+
+import (
+	"q5"
+	"main/model"
+)
+
+type BagItem struct {
+	ItemUniId string `json:"item_uniid"`
+	ItemId int32 `json:"item_id"`
+	ItemNum int32 `json:"item_num"`
+}
+
+func (this *BagItem) FromModel(m *model.Bag) {
+	this.ItemUniId = q5.ToString(m.Idx)
+	this.ItemId = m.ItemId
+	this.ItemNum = m.ItemNum
+}