From 977772f5ea23934b2110a3a327a20fc0cac066bf Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 10 Nov 2022 10:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=95=86=E5=BA=97=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E4=B8=8D=E6=8E=A8=E9=80=81=E8=B4=AD=E4=B9=B0=E5=9B=9E?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go               | 5 +++++
 comm/imodule.go             | 2 +-
 modules/equipment/module.go | 3 ++-
 modules/shop/api_buy.go     | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/comm/const.go b/comm/const.go
index 9a9f689c4..3077561ce 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -294,6 +294,11 @@ const (
 
 )
 
+//红点枚举
+type ReddotType int32
+
+const ()
+
 type TaskType int32
 
 // 日常任务事件类型
diff --git a/comm/imodule.go b/comm/imodule.go
index 63f61ee38..8814d7871 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -113,7 +113,7 @@ type (
 		//创建装备
 		NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment)
 		//添加装备
-		AddEquipment(equip *pb.DB_Equipment) (code pb.ErrorCode)
+		AddEquipment(session IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode)
 	}
 	IMainline interface {
 		// 修改章节信息
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 820e95eb6..e4f7b236e 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -146,7 +146,7 @@ func (this *Equipment) NewEquipment(uid, cid string) (code pb.ErrorCode, equip *
 }
 
 //创建新的装备
-func (this *Equipment) AddEquipment(equip *pb.DB_Equipment) (code pb.ErrorCode) {
+func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode) {
 	var (
 		err error
 	)
@@ -154,6 +154,7 @@ func (this *Equipment) AddEquipment(equip *pb.DB_Equipment) (code pb.ErrorCode)
 		code = pb.ErrorCode_DBError
 		return
 	}
+	this.equipmentsChangePush(session, []*pb.DB_Equipment{equip})
 	return
 }
 
diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go
index 7d26ad40a..3a98f96fc 100644
--- a/modules/shop/api_buy.go
+++ b/modules/shop/api_buy.go
@@ -59,9 +59,6 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
 		}
 	}
 
-	if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success {
-		return
-	}
 	switch req.ShopType {
 	case pb.ShopType_GoldShop:
 		filed = "goldShop"
@@ -94,13 +91,16 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
 		return
 	}
 	record.Buy[req.GoodsId] += req.BuyNum
+	if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success {
+		return
+	}
 	this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record})
 	if !conf.Preview {
 		if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success {
 			return
 		}
 	} else {
-		if code = this.module.equip.AddEquipment(record.Preview[req.GoodsId]); code == pb.ErrorCode_Success {
+		if code = this.module.equip.AddEquipment(session, record.Preview[req.GoodsId]); code != pb.ErrorCode_Success {
 			return
 		}
 	}