diff --git a/comm/imodule.go b/comm/imodule.go index bc1c727a1..c3c9c10e8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -687,4 +687,9 @@ type ( IMoonlv interface { IBuriedUpdateNotify } + //捉虫子 + ICatchBugs interface { + CreateRoom(sessions []IUserSession, rulesStr string) (roomid string, err error) + UserOffline(roomid string, uid string) (err error) + } ) diff --git a/modules/caninerabbit/room.go b/modules/caninerabbit/room.go index bae140991..26bd99444 100644 --- a/modules/caninerabbit/room.go +++ b/modules/caninerabbit/room.go @@ -160,6 +160,7 @@ func (this *Room) PlayerWin(uid string, handle *pb.CanineRabbitWinReq) (err erro this.module.Errorln(err) } } + this.module.rooms.removeRoom(this.data.Rid) return } diff --git a/modules/catchbugs/module.go b/modules/catchbugs/module.go index bed500600..1348c7a09 100644 --- a/modules/catchbugs/module.go +++ b/modules/catchbugs/module.go @@ -157,3 +157,15 @@ func (this *CatchBugs) createRoom(rules *pb.DBCatchBugsRules, red, blue *pb.DBCa go room.GameStart() return } + +//用户离线 +func (this *CatchBugs) UserOffline(roomid string, uid string) (err error) { + var ( + room *Room + ) + if room, err = this.rooms.queryRoom(roomid); err != nil { + return + } + err = room.PlayerOffline(uid) + return +} diff --git a/modules/catchbugs/room.go b/modules/catchbugs/room.go index 6362da449..833afeb02 100644 --- a/modules/catchbugs/room.go +++ b/modules/catchbugs/room.go @@ -297,6 +297,11 @@ func (this *Room) AiHandleByOpenCard() { } +func (this *Room) PlayerOffline(uid string) (err error) { + this.gameover() + return +} + func (this *Room) gameover() { winuid := "" if len(this.data.Red.Cards) > len(this.data.Blue.Cards) { @@ -327,6 +332,7 @@ func (this *Room) gameover() { Redintegral: this.data.Red.Integral, Blueintegral: this.data.Blue.Integral, }) + this.module.rooms.removeRoom(this.data.Rid) } //技能效果1 随机2x2的区域 旋转 diff --git a/modules/catchbugs/rooms.go b/modules/catchbugs/rooms.go index 6cc2b355c..434780b22 100644 --- a/modules/catchbugs/rooms.go +++ b/modules/catchbugs/rooms.go @@ -61,6 +61,6 @@ func (this *roomsComp) removeRoom(rid string) { delete(this.rooms, rid) this.lock.Unlock() if ok { - go this.module.gameInvite.GameInviteEnd(3, room.data.Red.Info.Uid) + go this.module.gameInvite.GameInviteEnd(4, room.data.Red.Info.Uid) } } diff --git a/modules/gameinvite/api_accept.go b/modules/gameinvite/api_accept.go index 7c4839870..d4e4079b0 100644 --- a/modules/gameinvite/api_accept.go +++ b/modules/gameinvite/api_accept.go @@ -141,6 +141,16 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR return } break + case 4: + if roomid, err = this.module.catchBugs.CreateRoom(sessions, rules); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + break } redRecord.Status = 1 redRecord.Roomid = roomid diff --git a/modules/gameinvite/api_qiecuo.go b/modules/gameinvite/api_qiecuo.go index 03729bcb1..ab0a90c6f 100644 --- a/modules/gameinvite/api_qiecuo.go +++ b/modules/gameinvite/api_qiecuo.go @@ -71,12 +71,12 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.GameInviteQiecuoR gamedata.Rules = req.Rules } - for i, v := range gamedata.Targets { - if v.Uid == session.GetUserId() { - gamedata.Targets = append(gamedata.Targets[0:i], gamedata.Targets[i+1:]...) - keep = true - } - } + // for i, v := range gamedata.Targets { + // if v.Uid == session.GetUserId() { + // gamedata.Targets = append(gamedata.Targets[0:i], gamedata.Targets[i+1:]...) + // keep = true + // } + // } for _, v := range gamedata.Targets { if v.Uid == req.Fid { diff --git a/modules/gameinvite/model.go b/modules/gameinvite/model.go index 7e6efa8de..0ab1bbb08 100644 --- a/modules/gameinvite/model.go +++ b/modules/gameinvite/model.go @@ -57,7 +57,7 @@ func (this *modelComp) endQiecuo(gtype int32, uid string) (result *pb.GameInvite this.Change(uid, map[string]interface{}{ "status": 0, "battid": "", - "Invite": make(map[int32]*pb.GameInviteData), + "invite": make(map[int32]*pb.GameInviteData), }) if _, ok := result.Invite[gtype]; ok { for _, v := range result.Invite[gtype].Member { @@ -65,7 +65,7 @@ func (this *modelComp) endQiecuo(gtype int32, uid string) (result *pb.GameInvite this.Change(v, map[string]interface{}{ "status": 0, "battid": "", - "Invite": make(map[int32]*pb.GameInviteData), + "invite": make(map[int32]*pb.GameInviteData), }) } } diff --git a/modules/gameinvite/module.go b/modules/gameinvite/module.go index 9945fab2d..a6641fc94 100644 --- a/modules/gameinvite/module.go +++ b/modules/gameinvite/module.go @@ -18,6 +18,7 @@ type GameInvite struct { pvp comm.IPvp dcolor comm.IDColor caninerabbit comm.ICanineRabbit + catchBugs comm.ICatchBugs } func NewModule() core.IModule { @@ -58,6 +59,10 @@ func (this *GameInvite) Start() (err error) { return } this.caninerabbit = module.(comm.ICanineRabbit) + if module, err = this.service.GetModule(comm.ModuleCatchbugs); err != nil { + return + } + this.catchBugs = module.(comm.ICatchBugs) this.service.RegisterFunctionName(string(comm.RPC_GameinviteOffline), this.trusteeship) event.RegisterGO(comm.EventUserOffline, this.Useroffline) return diff --git a/modules/pay/api_diamondinfo.go b/modules/pay/api_diamondinfo.go new file mode 100644 index 000000000..13de661c9 --- /dev/null +++ b/modules/pay/api_diamondinfo.go @@ -0,0 +1,34 @@ +package pay + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) DiamondInfoCheck(session comm.IUserSession, req *pb.PayDiamondInfoReq) (errdata *pb.ErrorData) { + + return +} + +// /获取系统公告 +func (this *apiComp) DiamondInfo(session comm.IUserSession, req *pb.PayDiamondInfoReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBPayDiamond + err error + ) + if errdata = this.DiamondInfoCheck(session, req); errdata != nil { + return + } + if info, err = this.module.modelDiamond.getmodel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + session.SendMsg(string(this.module.GetType()), "diamondinfo", &pb.PayDiamondInfoResp{Info: info}) + return +} diff --git a/pb/gameinvite_db.pb.go b/pb/gameinvite_db.pb.go index 4ab3b5376..97ad99b9a 100644 --- a/pb/gameinvite_db.pb.go +++ b/pb/gameinvite_db.pb.go @@ -150,7 +150,7 @@ type GameInviteQiecuoRecord struct { Gtype int32 `protobuf:"varint,4,opt,name=gtype,proto3" json:"gtype"` //当前游戏类型 0 武馆切磋 3 猜颜色 Roomid string `protobuf:"bytes,5,opt,name=roomid,proto3" json:"roomid"` //房间id Spath string `protobuf:"bytes,6,opt,name=spath,proto3" json:"spath"` //服务地址 - Invite map[int32]*GameInviteData `protobuf:"bytes,7,rep,name=Invite,proto3" json:"Invite" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //邀请数据 + Invite map[int32]*GameInviteData `protobuf:"bytes,7,rep,name=invite,proto3" json:"invite" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //邀请数据 } func (x *GameInviteQiecuoRecord) Reset() { @@ -260,10 +260,10 @@ var file_gameinvite_gameinvite_db_proto_rawDesc = []byte{ 0x05, 0x52, 0x05, 0x67, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x70, 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x73, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3b, 0x0a, 0x06, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, + 0x05, 0x73, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3b, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, - 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x49, 0x6e, 0x76, + 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x1a, 0x4a, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, @@ -293,7 +293,7 @@ var file_gameinvite_gameinvite_db_proto_goTypes = []interface{}{ } var file_gameinvite_gameinvite_db_proto_depIdxs = []int32{ 0, // 0: GameInviteData.targets:type_name -> GameInviteQiecuoInvite - 3, // 1: GameInviteQiecuoRecord.Invite:type_name -> GameInviteQiecuoRecord.InviteEntry + 3, // 1: GameInviteQiecuoRecord.invite:type_name -> GameInviteQiecuoRecord.InviteEntry 1, // 2: GameInviteQiecuoRecord.InviteEntry.value:type_name -> GameInviteData 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type diff --git a/pb/pay_msg.pb.go b/pb/pay_msg.pb.go index 345627915..f40d4452e 100644 --- a/pb/pay_msg.pb.go +++ b/pb/pay_msg.pb.go @@ -323,6 +323,92 @@ func (x *PayRecordResp) GetInfo() *DBUserPay { return nil } +//用户重置信息获取 +type PayDiamondInfoReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PayDiamondInfoReq) Reset() { + *x = PayDiamondInfoReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayDiamondInfoReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayDiamondInfoReq) ProtoMessage() {} + +func (x *PayDiamondInfoReq) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PayDiamondInfoReq.ProtoReflect.Descriptor instead. +func (*PayDiamondInfoReq) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{6} +} + +type PayDiamondInfoResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBPayDiamond `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` +} + +func (x *PayDiamondInfoResp) Reset() { + *x = PayDiamondInfoResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayDiamondInfoResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayDiamondInfoResp) ProtoMessage() {} + +func (x *PayDiamondInfoResp) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PayDiamondInfoResp.ProtoReflect.Descriptor instead. +func (*PayDiamondInfoResp) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *PayDiamondInfoResp) GetInfo() *DBPayDiamond { + if x != nil { + return x.Info + } + return nil +} + //用户重置信息获取 type PayInfoReq struct { state protoimpl.MessageState @@ -333,7 +419,7 @@ type PayInfoReq struct { func (x *PayInfoReq) Reset() { *x = PayInfoReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[6] + mi := &file_pay_pay_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -346,7 +432,7 @@ func (x *PayInfoReq) String() string { func (*PayInfoReq) ProtoMessage() {} func (x *PayInfoReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[6] + mi := &file_pay_pay_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -359,7 +445,7 @@ func (x *PayInfoReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayInfoReq.ProtoReflect.Descriptor instead. func (*PayInfoReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{6} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{8} } type PayInfoResp struct { @@ -373,7 +459,7 @@ type PayInfoResp struct { func (x *PayInfoResp) Reset() { *x = PayInfoResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[7] + mi := &file_pay_pay_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -386,7 +472,7 @@ func (x *PayInfoResp) String() string { func (*PayInfoResp) ProtoMessage() {} func (x *PayInfoResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[7] + mi := &file_pay_pay_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -399,7 +485,7 @@ func (x *PayInfoResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayInfoResp.ProtoReflect.Descriptor instead. func (*PayInfoResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{7} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{9} } func (x *PayInfoResp) GetInfo() *DBPayDaily { @@ -421,7 +507,7 @@ type PayDailyBuyReq struct { func (x *PayDailyBuyReq) Reset() { *x = PayDailyBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[8] + mi := &file_pay_pay_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -434,7 +520,7 @@ func (x *PayDailyBuyReq) String() string { func (*PayDailyBuyReq) ProtoMessage() {} func (x *PayDailyBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[8] + mi := &file_pay_pay_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -447,7 +533,7 @@ func (x *PayDailyBuyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayDailyBuyReq.ProtoReflect.Descriptor instead. func (*PayDailyBuyReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{8} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{10} } func (x *PayDailyBuyReq) GetId() int32 { @@ -469,7 +555,7 @@ type PayDailyBuyResp struct { func (x *PayDailyBuyResp) Reset() { *x = PayDailyBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[9] + mi := &file_pay_pay_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -482,7 +568,7 @@ func (x *PayDailyBuyResp) String() string { func (*PayDailyBuyResp) ProtoMessage() {} func (x *PayDailyBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[9] + mi := &file_pay_pay_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -495,7 +581,7 @@ func (x *PayDailyBuyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayDailyBuyResp.ProtoReflect.Descriptor instead. func (*PayDailyBuyResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{9} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{11} } func (x *PayDailyBuyResp) GetIsucc() bool { @@ -526,7 +612,7 @@ type PayShippedPush struct { func (x *PayShippedPush) Reset() { *x = PayShippedPush{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[10] + mi := &file_pay_pay_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -539,7 +625,7 @@ func (x *PayShippedPush) String() string { func (*PayShippedPush) ProtoMessage() {} func (x *PayShippedPush) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[10] + mi := &file_pay_pay_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -552,7 +638,7 @@ func (x *PayShippedPush) ProtoReflect() protoreflect.Message { // Deprecated: Use PayShippedPush.ProtoReflect.Descriptor instead. func (*PayShippedPush) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{10} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{12} } func (x *PayShippedPush) GetOrder() *DBPayOrder { @@ -590,7 +676,7 @@ type PayDeliveryReq struct { func (x *PayDeliveryReq) Reset() { *x = PayDeliveryReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[11] + mi := &file_pay_pay_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -603,7 +689,7 @@ func (x *PayDeliveryReq) String() string { func (*PayDeliveryReq) ProtoMessage() {} func (x *PayDeliveryReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[11] + mi := &file_pay_pay_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -616,7 +702,7 @@ func (x *PayDeliveryReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayDeliveryReq.ProtoReflect.Descriptor instead. func (*PayDeliveryReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{11} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{13} } func (x *PayDeliveryReq) GetPtype() DBPayType { @@ -652,7 +738,7 @@ type PayDeliveryResp struct { func (x *PayDeliveryResp) Reset() { *x = PayDeliveryResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[12] + mi := &file_pay_pay_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -665,7 +751,7 @@ func (x *PayDeliveryResp) String() string { func (*PayDeliveryResp) ProtoMessage() {} func (x *PayDeliveryResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[12] + mi := &file_pay_pay_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -678,7 +764,7 @@ func (x *PayDeliveryResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayDeliveryResp.ProtoReflect.Descriptor instead. func (*PayDeliveryResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{12} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{14} } func (x *PayDeliveryResp) GetOrder() *DBPayOrder { @@ -700,7 +786,7 @@ type PayGetActivityReq struct { func (x *PayGetActivityReq) Reset() { *x = PayGetActivityReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[13] + mi := &file_pay_pay_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -713,7 +799,7 @@ func (x *PayGetActivityReq) String() string { func (*PayGetActivityReq) ProtoMessage() {} func (x *PayGetActivityReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[13] + mi := &file_pay_pay_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -726,7 +812,7 @@ func (x *PayGetActivityReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayGetActivityReq.ProtoReflect.Descriptor instead. func (*PayGetActivityReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{13} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{15} } func (x *PayGetActivityReq) GetAtype() int32 { @@ -747,7 +833,7 @@ type PayGetActivityResp struct { func (x *PayGetActivityResp) Reset() { *x = PayGetActivityResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[14] + mi := &file_pay_pay_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -760,7 +846,7 @@ func (x *PayGetActivityResp) String() string { func (*PayGetActivityResp) ProtoMessage() {} func (x *PayGetActivityResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[14] + mi := &file_pay_pay_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -773,7 +859,7 @@ func (x *PayGetActivityResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayGetActivityResp.ProtoReflect.Descriptor instead. func (*PayGetActivityResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{14} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{16} } func (x *PayGetActivityResp) GetInfo() *ActivityGiftbagItem { @@ -795,7 +881,7 @@ type PayActivityBuyReq struct { func (x *PayActivityBuyReq) Reset() { *x = PayActivityBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[15] + mi := &file_pay_pay_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -808,7 +894,7 @@ func (x *PayActivityBuyReq) String() string { func (*PayActivityBuyReq) ProtoMessage() {} func (x *PayActivityBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[15] + mi := &file_pay_pay_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -821,7 +907,7 @@ func (x *PayActivityBuyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayActivityBuyReq.ProtoReflect.Descriptor instead. func (*PayActivityBuyReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{15} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{17} } func (x *PayActivityBuyReq) GetId() int32 { @@ -843,7 +929,7 @@ type PayActivityResp struct { func (x *PayActivityResp) Reset() { *x = PayActivityResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[16] + mi := &file_pay_pay_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -856,7 +942,7 @@ func (x *PayActivityResp) String() string { func (*PayActivityResp) ProtoMessage() {} func (x *PayActivityResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[16] + mi := &file_pay_pay_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -869,7 +955,7 @@ func (x *PayActivityResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayActivityResp.ProtoReflect.Descriptor instead. func (*PayActivityResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{16} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{18} } func (x *PayActivityResp) GetIsucc() bool { @@ -902,7 +988,7 @@ type HttpPayDeliveryReq struct { func (x *HttpPayDeliveryReq) Reset() { *x = HttpPayDeliveryReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[17] + mi := &file_pay_pay_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -915,7 +1001,7 @@ func (x *HttpPayDeliveryReq) String() string { func (*HttpPayDeliveryReq) ProtoMessage() {} func (x *HttpPayDeliveryReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[17] + mi := &file_pay_pay_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -928,7 +1014,7 @@ func (x *HttpPayDeliveryReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HttpPayDeliveryReq.ProtoReflect.Descriptor instead. func (*HttpPayDeliveryReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{17} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{19} } func (x *HttpPayDeliveryReq) GetUid() string { @@ -980,7 +1066,7 @@ type HttpPayDeliveryResp struct { func (x *HttpPayDeliveryResp) Reset() { *x = HttpPayDeliveryResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[18] + mi := &file_pay_pay_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -993,7 +1079,7 @@ func (x *HttpPayDeliveryResp) String() string { func (*HttpPayDeliveryResp) ProtoMessage() {} func (x *HttpPayDeliveryResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[18] + mi := &file_pay_pay_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1006,7 +1092,7 @@ func (x *HttpPayDeliveryResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HttpPayDeliveryResp.ProtoReflect.Descriptor instead. func (*HttpPayDeliveryResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{18} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{20} } func (x *HttpPayDeliveryResp) GetCode() ErrorCode { @@ -1059,64 +1145,69 @@ var file_pay_pay_msg_proto_rawDesc = []byte{ 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, - 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x0c, 0x0a, 0x0a, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x65, 0x71, 0x22, 0x2e, 0x0a, 0x0b, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x20, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, + 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x44, 0x69, 0x61, + 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x12, 0x50, + 0x61, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x52, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x0c, 0x0a, 0x0a, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x65, 0x71, 0x22, 0x2e, 0x0a, 0x0b, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x04, 0x69, 0x6e, + 0x66, 0x6f, 0x22, 0x20, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x42, 0x75, + 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, + 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1f, 0x0a, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x74, + 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x52, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x69, + 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, + 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, + 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, + 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, - 0x6c, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, + 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x12, - 0x1f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x22, 0x74, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, - 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, - 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d, - 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, - 0x74, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x47, - 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, - 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x04, 0x69, 0x6e, 0x66, - 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x41, - 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, - 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x75, 0x63, - 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79, - 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x64, 0x75, - 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x64, - 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79, 0x44, 0x65, - 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, - 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79, 0x44, 0x65, + 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, + 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, + 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, + 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1131,7 +1222,7 @@ func file_pay_pay_msg_proto_rawDescGZIP() []byte { return file_pay_pay_msg_proto_rawDescData } -var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_pay_pay_msg_proto_goTypes = []interface{}{ (*PayCreateOrderReq)(nil), // 0: PayCreateOrderReq (*PayCreateOrderResp)(nil), // 1: PayCreateOrderResp @@ -1139,49 +1230,53 @@ var file_pay_pay_msg_proto_goTypes = []interface{}{ (*PayResponseOrderResp)(nil), // 3: PayResponseOrderResp (*PayRecordReq)(nil), // 4: PayRecordReq (*PayRecordResp)(nil), // 5: PayRecordResp - (*PayInfoReq)(nil), // 6: PayInfoReq - (*PayInfoResp)(nil), // 7: PayInfoResp - (*PayDailyBuyReq)(nil), // 8: PayDailyBuyReq - (*PayDailyBuyResp)(nil), // 9: PayDailyBuyResp - (*PayShippedPush)(nil), // 10: PayShippedPush - (*PayDeliveryReq)(nil), // 11: PayDeliveryReq - (*PayDeliveryResp)(nil), // 12: PayDeliveryResp - (*PayGetActivityReq)(nil), // 13: PayGetActivityReq - (*PayGetActivityResp)(nil), // 14: PayGetActivityResp - (*PayActivityBuyReq)(nil), // 15: PayActivityBuyReq - (*PayActivityResp)(nil), // 16: PayActivityResp - (*HttpPayDeliveryReq)(nil), // 17: HttpPayDeliveryReq - (*HttpPayDeliveryResp)(nil), // 18: HttpPayDeliveryResp - (DBPayType)(0), // 19: DBPayType - (*DBPayOrder)(nil), // 20: DBPayOrder - (DBPayOrderState)(0), // 21: DBPayOrderState - (*DBUserPay)(nil), // 22: DBUserPay - (*DBPayDaily)(nil), // 23: DBPayDaily - (*UserAtno)(nil), // 24: UserAtno - (*ActivityGiftbagItem)(nil), // 25: ActivityGiftbagItem - (*UserAssets)(nil), // 26: UserAssets - (ErrorCode)(0), // 27: ErrorCode + (*PayDiamondInfoReq)(nil), // 6: PayDiamondInfoReq + (*PayDiamondInfoResp)(nil), // 7: PayDiamondInfoResp + (*PayInfoReq)(nil), // 8: PayInfoReq + (*PayInfoResp)(nil), // 9: PayInfoResp + (*PayDailyBuyReq)(nil), // 10: PayDailyBuyReq + (*PayDailyBuyResp)(nil), // 11: PayDailyBuyResp + (*PayShippedPush)(nil), // 12: PayShippedPush + (*PayDeliveryReq)(nil), // 13: PayDeliveryReq + (*PayDeliveryResp)(nil), // 14: PayDeliveryResp + (*PayGetActivityReq)(nil), // 15: PayGetActivityReq + (*PayGetActivityResp)(nil), // 16: PayGetActivityResp + (*PayActivityBuyReq)(nil), // 17: PayActivityBuyReq + (*PayActivityResp)(nil), // 18: PayActivityResp + (*HttpPayDeliveryReq)(nil), // 19: HttpPayDeliveryReq + (*HttpPayDeliveryResp)(nil), // 20: HttpPayDeliveryResp + (DBPayType)(0), // 21: DBPayType + (*DBPayOrder)(nil), // 22: DBPayOrder + (DBPayOrderState)(0), // 23: DBPayOrderState + (*DBUserPay)(nil), // 24: DBUserPay + (*DBPayDiamond)(nil), // 25: DBPayDiamond + (*DBPayDaily)(nil), // 26: DBPayDaily + (*UserAtno)(nil), // 27: UserAtno + (*ActivityGiftbagItem)(nil), // 28: ActivityGiftbagItem + (*UserAssets)(nil), // 29: UserAssets + (ErrorCode)(0), // 30: ErrorCode } var file_pay_pay_msg_proto_depIdxs = []int32{ - 19, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType - 20, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder - 21, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState - 22, // 3: PayRecordResp.info:type_name -> DBUserPay - 23, // 4: PayInfoResp.info:type_name -> DBPayDaily - 24, // 5: PayDailyBuyResp.items:type_name -> UserAtno - 20, // 6: PayShippedPush.order:type_name -> DBPayOrder - 24, // 7: PayShippedPush.items:type_name -> UserAtno - 22, // 8: PayShippedPush.info:type_name -> DBUserPay - 19, // 9: PayDeliveryReq.ptype:type_name -> DBPayType - 20, // 10: PayDeliveryResp.order:type_name -> DBPayOrder - 25, // 11: PayGetActivityResp.info:type_name -> ActivityGiftbagItem - 26, // 12: PayActivityResp.items:type_name -> UserAssets - 27, // 13: HttpPayDeliveryResp.code:type_name -> ErrorCode - 14, // [14:14] is the sub-list for method output_type - 14, // [14:14] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 21, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType + 22, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder + 23, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState + 24, // 3: PayRecordResp.info:type_name -> DBUserPay + 25, // 4: PayDiamondInfoResp.info:type_name -> DBPayDiamond + 26, // 5: PayInfoResp.info:type_name -> DBPayDaily + 27, // 6: PayDailyBuyResp.items:type_name -> UserAtno + 22, // 7: PayShippedPush.order:type_name -> DBPayOrder + 27, // 8: PayShippedPush.items:type_name -> UserAtno + 24, // 9: PayShippedPush.info:type_name -> DBUserPay + 21, // 10: PayDeliveryReq.ptype:type_name -> DBPayType + 22, // 11: PayDeliveryResp.order:type_name -> DBPayOrder + 28, // 12: PayGetActivityResp.info:type_name -> ActivityGiftbagItem + 29, // 13: PayActivityResp.items:type_name -> UserAssets + 30, // 14: HttpPayDeliveryResp.code:type_name -> ErrorCode + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_pay_pay_msg_proto_init() } @@ -1266,7 +1361,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayInfoReq); i { + switch v := v.(*PayDiamondInfoReq); i { case 0: return &v.state case 1: @@ -1278,7 +1373,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayInfoResp); i { + switch v := v.(*PayDiamondInfoResp); i { case 0: return &v.state case 1: @@ -1290,7 +1385,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDailyBuyReq); i { + switch v := v.(*PayInfoReq); i { case 0: return &v.state case 1: @@ -1302,7 +1397,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDailyBuyResp); i { + switch v := v.(*PayInfoResp); i { case 0: return &v.state case 1: @@ -1314,7 +1409,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayShippedPush); i { + switch v := v.(*PayDailyBuyReq); i { case 0: return &v.state case 1: @@ -1326,7 +1421,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDeliveryReq); i { + switch v := v.(*PayDailyBuyResp); i { case 0: return &v.state case 1: @@ -1338,7 +1433,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDeliveryResp); i { + switch v := v.(*PayShippedPush); i { case 0: return &v.state case 1: @@ -1350,7 +1445,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayGetActivityReq); i { + switch v := v.(*PayDeliveryReq); i { case 0: return &v.state case 1: @@ -1362,7 +1457,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayGetActivityResp); i { + switch v := v.(*PayDeliveryResp); i { case 0: return &v.state case 1: @@ -1374,7 +1469,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayActivityBuyReq); i { + switch v := v.(*PayGetActivityReq); i { case 0: return &v.state case 1: @@ -1386,7 +1481,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayActivityResp); i { + switch v := v.(*PayGetActivityResp); i { case 0: return &v.state case 1: @@ -1398,7 +1493,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpPayDeliveryReq); i { + switch v := v.(*PayActivityBuyReq); i { case 0: return &v.state case 1: @@ -1410,6 +1505,30 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayActivityResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pay_pay_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HttpPayDeliveryReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pay_pay_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HttpPayDeliveryResp); i { case 0: return &v.state @@ -1428,7 +1547,7 @@ func file_pay_pay_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pay_pay_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 19, + NumMessages: 21, NumExtensions: 0, NumServices: 0, },