From eb32e72916ca4812b7aa6b66d4568397f61ab4ae Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Wed, 25 Sep 2024 17:04:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=83=E5=A8=83=E5=85=8C=E6=8F=9B=E8=A8=98?=
 =?UTF-8?q?=E9=8C=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/action_bag.go | 15 ---------------
 worldsrv/shopmgr.go    |  7 +++----
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/worldsrv/action_bag.go b/worldsrv/action_bag.go
index ce781d3..db955b0 100644
--- a/worldsrv/action_bag.go
+++ b/worldsrv/action_bag.go
@@ -29,21 +29,6 @@ func CSBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) err
 		if platform == nil {
 			return nil
 		}
-
-		BagMgrSingleton.AddItems(&model.AddItemParam{
-			Platform: p.Platform,
-			SnId:     p.SnId,
-			Change: []*model.Item{
-				{
-					ItemId:  40004,
-					ItemNum: 1000,
-				},
-			},
-			GainWay:  common.GainWayItemBagChangeDoll,
-			Operator: "system",
-			Remark:   "背包内使用兑换娃娃卡",
-		})
-
 		//nowLocation := int(msg.NowLocation - 1)
 		tp := msg.GetTp() // 道具类型
 		bagInfo := BagMgrSingleton.GetBagInfo(p.SnId)
diff --git a/worldsrv/shopmgr.go b/worldsrv/shopmgr.go
index 9eaa549..5441ecb 100644
--- a/worldsrv/shopmgr.go
+++ b/worldsrv/shopmgr.go
@@ -1445,18 +1445,17 @@ func (this *ShopMgr) GetDollExchangeRecord(p *Player) *bag.SCDillChangeLog {
 		return as
 	}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
 		if data != nil {
-			if as := data.(*webapi_proto.SAGetExchangeOrder); as != nil {
+			if as := data.(*webapi_proto.SAGetDollExchangeOrder); as != nil {
 				for _, v := range as.OrderList {
-
+					cdata := this.GetExchangeData(p.Platform, v.GoodsId)
 					record := &bag.DillChangeLogInfo{
 						CreateTs: strconv.FormatInt(v.CreateTime, 10),
 						State:    v.Status,
 						Remark:   v.Remark,
-						ItemId:   v.GoodsId,
+						ItemId:   cdata.ItemId,
 						ItemNum:  v.ExchangeNum,
 						TypeId:   2,
 					}
-					// remark
 					pack.Info = append(pack.Info, record)
 				}
 			}