diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index cdea7c212..ab1ddf736 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -19,15 +19,17 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetList ///获取用户商品列表 func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode, data proto.Message) { var ( - err error - filed string - shopconf *cfg.Game_shopData - shopData *pb.DBShop - sdata *pb.UserShopData - items []*cfg.Game_shopitemData - goods []*pb.ShopItem - tdata time.Duration - ltime time.Duration + err error + filed string + shopconf *cfg.Game_shopData + shopData *pb.DBShop + udata *pb.DBUser + sdata *pb.UserShopData + items []*cfg.Game_shopitemData + ushoputem map[int32]*pb.DBShopItem + goods []*pb.ShopItem + tdata time.Duration + ltime time.Duration ) defer func() { if code == pb.ErrorCode_Success { @@ -42,7 +44,14 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) code = pb.ErrorCode_SystemError return } - + if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil { + code = pb.ErrorCode_SystemError + return + } + if ushoputem, err = this.module.modelShopItems.QueryUserShopData(session.GetUserId()); err != nil { + code = pb.ErrorCode_SystemError + return + } switch req.SType { case pb.ShopType_GoldShop: sdata = shopData.GoldShop @@ -91,13 +100,13 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) var _items []*cfg.Game_shopitemData for _, v := range shopconf.Shopitem { - if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v); err != nil { + if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil { code = pb.ErrorCode_SystemError return } items = append(items, randomGoods(_items)) } - goods = transGoods(items) + goods = transGoods(items, ushoputem) sdata.LastRefreshTime = time.Now().Unix() sdata.Items = make([]int32, len(items)) for i, v := range items { @@ -108,13 +117,13 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) if tdata > ltime { //达到刷新时间 可以刷新商品列表 var _items []*cfg.Game_shopitemData for _, v := range shopconf.Shopitem { - if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v); err != nil { + if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil { code = pb.ErrorCode_SystemError return } items = append(items, randomGoods(_items)) } - goods = transGoods(items) + goods = transGoods(items, ushoputem) sdata.LastRefreshTime = time.Now().Unix() sdata.Items = make([]int32, len(items)) for i, v := range items { @@ -126,7 +135,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) code = pb.ErrorCode_SystemError return } - goods = transGoods(items) + goods = transGoods(items, ushoputem) } } else { code = pb.ErrorCode_ReqParameterError diff --git a/modules/shop/configure.go b/modules/shop/configure.go index dcb0e3136..06ea89de8 100644 --- a/modules/shop/configure.go +++ b/modules/shop/configure.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" + "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" ) @@ -65,7 +66,7 @@ func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.Game_sh } //读取商品组 -func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32) (result []*cfg.Game_shopitemData, err error) { +func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb.DBUser) (result []*cfg.Game_shopitemData, err error) { result = make([]*cfg.Game_shopitemData, 0, 10) var ( v interface{} @@ -78,7 +79,10 @@ func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32) (result } else { table = v.(*cfg.Game_shopitem) for _, v := range table.GetDataMap() { - if v.Id == groupid { + if v.Id == groupid && + user.Lv >= v.Lvmin && + user.Lv <= v.Lvmax && + v.Vip >= v.Vip { result = append(result, item) } } diff --git a/modules/shop/core.go b/modules/shop/core.go index 3f279b52f..250ce0b33 100644 --- a/modules/shop/core.go +++ b/modules/shop/core.go @@ -30,13 +30,19 @@ func randomGoods(goods []*cfg.Game_shopitemData) (result *cfg.Game_shopitemData) } //转换商品对象 -func transGoods(goods []*cfg.Game_shopitemData) (result []*pb.ShopItem) { +func transGoods(goods []*cfg.Game_shopitemData, ushoputem map[int32]*pb.DBShopItem) (result []*pb.ShopItem) { result = make([]*pb.ShopItem, len(goods)) + ok := false + uitem := &pb.DBShopItem{} for i, v := range goods { + if uitem, ok = ushoputem[v.Key]; !ok { + uitem = &pb.DBShopItem{} + } result[i] = &pb.ShopItem{ GoodsId: v.Key, Sale: int32(v.Sale), } + result[i].LeftBuyNum = v.Buyminnum - uitem.BuyNum result[i].Items = make([]*pb.Resource, len(v.Iteminfo)) for i1, v1 := range v.Iteminfo { result[i].Items[i1] = &pb.Resource{ diff --git a/modules/shop/model_shopitems.go b/modules/shop/model_shopitems.go index 2ec8d6044..363067ebb 100644 --- a/modules/shop/model_shopitems.go +++ b/modules/shop/model_shopitems.go @@ -3,6 +3,7 @@ package shop import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" + "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" @@ -30,9 +31,16 @@ func (this *modelShopItemsComp) Init(service core.IService, module core.IModule, } //查询用户装备数据 -func (this *modelShopItemsComp) QueryUserShopData(uId string) (data []*pb.DBShopItem, err error) { - data = make([]*pb.DBShopItem, 0) - err = this.GetList(uId, &data) +func (this *modelShopItemsComp) QueryUserShopData(uId string) (result map[int32]*pb.DBShopItem, err error) { + result = make(map[int32]*pb.DBShopItem) + data := make([]*pb.DBShopItem, 0) + if err = this.GetList(uId, &data); err != nil && err != mgo.MongodbNil { + return + } + err = nil + for _, v := range data { + result[v.GoodsId] = v + } return } diff --git a/pb/proto/shop/shop_msg.proto b/pb/proto/shop/shop_msg.proto index a310ff540..1bacece72 100644 --- a/pb/proto/shop/shop_msg.proto +++ b/pb/proto/shop/shop_msg.proto @@ -15,7 +15,8 @@ message ShopItem { int32 GoodsId = 1; //商品Id repeated Resource Items = 2; //货物 repeated Resource Consume = 3; //消耗 - int32 Sale = 4; //打折 + int32 Sale = 4; //打折 + int32 LeftBuyNum = 5; //还可购买次数 } //获取装备列表请求 diff --git a/pb/shop_msg.pb.go b/pb/shop_msg.pb.go index 9954f0524..9fd96cdf1 100644 --- a/pb/shop_msg.pb.go +++ b/pb/shop_msg.pb.go @@ -90,10 +90,11 @@ type ShopItem struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GoodsId int32 `protobuf:"varint,1,opt,name=GoodsId,proto3" json:"GoodsId"` //商品Id - Items []*Resource `protobuf:"bytes,2,rep,name=Items,proto3" json:"Items"` //货物 - Consume []*Resource `protobuf:"bytes,3,rep,name=Consume,proto3" json:"Consume"` //消耗 - Sale int32 `protobuf:"varint,4,opt,name=Sale,proto3" json:"Sale"` //打折 + GoodsId int32 `protobuf:"varint,1,opt,name=GoodsId,proto3" json:"GoodsId"` //商品Id + Items []*Resource `protobuf:"bytes,2,rep,name=Items,proto3" json:"Items"` //货物 + Consume []*Resource `protobuf:"bytes,3,rep,name=Consume,proto3" json:"Consume"` //消耗 + Sale int32 `protobuf:"varint,4,opt,name=Sale,proto3" json:"Sale"` //打折 + LeftBuyNum int32 `protobuf:"varint,5,opt,name=LeftBuyNum,proto3" json:"LeftBuyNum"` //还可购买次数 } func (x *ShopItem) Reset() { @@ -156,6 +157,13 @@ func (x *ShopItem) GetSale() int32 { return 0 } +func (x *ShopItem) GetLeftBuyNum() int32 { + if x != nil { + return x.LeftBuyNum + } + return 0 +} + //获取装备列表请求 type ShopGetListReq struct { state protoimpl.MessageState @@ -368,30 +376,32 @@ var file_shop_shop_msg_proto_rawDesc = []byte{ 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x22, 0x7e, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, - 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x23, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x73, - 0x75, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x12, 0x0a, - 0x04, 0x53, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x61, 0x6c, - 0x65, 0x22, 0x5b, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, - 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, - 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x32, - 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, - 0x64, 0x73, 0x22, 0x26, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, - 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x22, 0x25, 0x0a, 0x0b, 0x53, 0x68, - 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, - 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, - 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, + 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x23, 0x0a, 0x07, 0x43, 0x6f, 0x6e, + 0x73, 0x75, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x53, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x61, + 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x65, 0x66, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4c, 0x65, 0x66, 0x74, 0x42, 0x75, 0x79, 0x4e, + 0x75, 0x6d, 0x22, 0x5b, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, + 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, + 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, + 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, + 0x32, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, + 0x6f, 0x64, 0x73, 0x22, 0x26, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, + 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x22, 0x25, 0x0a, 0x0b, 0x53, + 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, + 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, + 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var (