From 7c00ec5067ae6e8868df7d581c77bddff91c6e9c Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Tue, 3 Sep 2024 18:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=85=B7=E4=BF=AE=E6=94=B9=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/svc/u_bag.go        | 14 ++++++++++++--
 worldsrv/trascate_webapi.go | 10 ++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dbproxy/svc/u_bag.go b/dbproxy/svc/u_bag.go
index 48afcfd..cc07df2 100644
--- a/dbproxy/svc/u_bag.go
+++ b/dbproxy/svc/u_bag.go
@@ -101,7 +101,8 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 	for id, v := range args.BagItem {
 		if item, exist := bag.BagItem[id]; !exist {
 			if v.ItemNum <= 0 {
-				continue
+				err = errors.New("item num not enough")
+				break
 			}
 			bag.BagItem[id] = &model.Item{
 				ItemId:     v.ItemId,
@@ -110,7 +111,8 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 			}
 		} else {
 			if v.ItemNum < 0 && -v.ItemNum > item.ItemNum {
-				v.ItemNum = -item.ItemNum
+				err = errors.New("item num not enough")
+				break
 			}
 			item.ItemNum += v.ItemNum
 		}
@@ -119,10 +121,18 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 			vCard = v.ItemNum
 		}
 	}
+
+	if err != nil {
+		*ret = false
+		logger.Logger.Errorf("AddBagItem error: %v", err)
+		return err
+	}
+
 	_, err = cbag.Upsert(bson.M{"_id": bag.BagId}, bag)
 	if err != nil {
 		*ret = false
 		logger.Logger.Info("AddBagItem error ", err)
+		return err
 	}
 
 	// v卡返还
diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go
index 454fedd..bb2e4e6 100644
--- a/worldsrv/trascate_webapi.go
+++ b/worldsrv/trascate_webapi.go
@@ -3761,15 +3761,21 @@ func init() {
 			p := PlayerMgrSington.GetPlayerBySnId(msg.GetSnid())
 			if p != nil {
 				//获取道具Id
-				BagMgrSingleton.AddItemsV2(&model.AddItemParam{
+				_, _, ok := BagMgrSingleton.AddItemsV2(&model.AddItemParam{
 					P:        p.PlayerData,
 					Change:   items,
 					GainWay:  msg.GetTypeId(),
 					Operator: "system",
 					Remark:   msg.GetRemark(),
 				})
+				if !ok {
+					logger.Logger.Errorf("player delete %v err: %v", msg, err)
+					pack.Tag = webapiproto.TagCode_FAILED
+					pack.Msg = "修改道具失败"
+					return common.ResponseTag_Ok, pack
+				}
 				pack.Tag = webapiproto.TagCode_SUCCESS
-				pack.Msg = "AddItem success"
+				pack.Msg = "修改道具成功"
 				return common.ResponseTag_Ok, pack
 			} else {
 				BagMgrSingleton.AddItemsOffline(msg.Platform, msg.Snid, items, msg.GetTypeId(),