From 0830aa6488db6e45bfc14f1750796fc37851b30c Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 10 Nov 2022 14:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=85=E5=80=BC=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pay/api_delivery.go | 34 +++++ modules/pay/api_record.go | 31 +++++ modules/pay/modelDaily.go | 1 - pb/pay_db.pb.go | 2 +- pb/pay_msg.pb.go | 270 ++++++++++++++++++++++++++---------- 5 files changed, 261 insertions(+), 77 deletions(-) create mode 100644 modules/pay/api_delivery.go create mode 100644 modules/pay/api_record.go diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go new file mode 100644 index 000000000..97b008919 --- /dev/null +++ b/modules/pay/api_delivery.go @@ -0,0 +1,34 @@ +package pay + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode) { + + return +} + +///模拟充值 +func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode, data proto.Message) { + var ( + err error + ) + if code = this.DeliveryCheck(session, req); code != pb.ErrorCode_Success { + return + } + req.Orderid = primitive.NewObjectID().Hex() + req.Uid = session.GetUserId() + if err = this.module.Rpc_ModulePayDelivery(context.Background(), req, &pb.PayDeliveryResp{}); err != nil { + this.module.Errorln(err) + return + } + session.SendMsg(string(this.module.GetType()), "delivery", &pb.PayDeliveryResp{Code: code}) + return +} diff --git a/modules/pay/api_record.go b/modules/pay/api_record.go new file mode 100644 index 000000000..511b5ba1b --- /dev/null +++ b/modules/pay/api_record.go @@ -0,0 +1,31 @@ +package pay + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode) { + + return +} + +///获取系统公告 +func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode, data proto.Message) { + var ( + info *pb.DBUserPay + err error + ) + if code = this.RecordCheck(session, req); code != pb.ErrorCode_Success { + return + } + if info, err = this.module.modelPayUser.queryUserPay(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "record", &pb.PayRecordResp{Info: info}) + return +} diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index 998be9f17..51dbd834d 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -41,7 +41,6 @@ func (this *modelDailyComp) queryUserDaily(uId string) (result *pb.DBPayDaily, e this.module.Errorf("err:%v", err) } if err == mgo.MongodbNil { - err = nil } return diff --git a/pb/pay_db.pb.go b/pb/pay_db.pb.go index 0650c413f..0b4f9500e 100644 --- a/pb/pay_db.pb.go +++ b/pb/pay_db.pb.go @@ -92,7 +92,7 @@ func (x *DBPayOrder) GetCtime() int64 { return 0 } -//用户每日礼包 +// type DBUserPay struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pb/pay_msg.pb.go b/pb/pay_msg.pb.go index e24ed4f98..810da9d9d 100644 --- a/pb/pay_msg.pb.go +++ b/pb/pay_msg.pb.go @@ -20,6 +20,93 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +//充值记录 +type PayRecordReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PayRecordReq) Reset() { + *x = PayRecordReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayRecordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayRecordReq) ProtoMessage() {} + +func (x *PayRecordReq) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[0] + 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 PayRecordReq.ProtoReflect.Descriptor instead. +func (*PayRecordReq) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{0} +} + +//充值记录 +type PayRecordResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBUserPay `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` +} + +func (x *PayRecordResp) Reset() { + *x = PayRecordResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayRecordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayRecordResp) ProtoMessage() {} + +func (x *PayRecordResp) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[1] + 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 PayRecordResp.ProtoReflect.Descriptor instead. +func (*PayRecordResp) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *PayRecordResp) GetInfo() *DBUserPay { + if x != nil { + return x.Info + } + return nil +} + //用户重置信息获取 type PayInfoReq struct { state protoimpl.MessageState @@ -30,7 +117,7 @@ type PayInfoReq struct { func (x *PayInfoReq) Reset() { *x = PayInfoReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[0] + mi := &file_pay_pay_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -43,7 +130,7 @@ func (x *PayInfoReq) String() string { func (*PayInfoReq) ProtoMessage() {} func (x *PayInfoReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[0] + mi := &file_pay_pay_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -56,7 +143,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{0} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{2} } type PayInfoResp struct { @@ -70,7 +157,7 @@ type PayInfoResp struct { func (x *PayInfoResp) Reset() { *x = PayInfoResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[1] + mi := &file_pay_pay_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -83,7 +170,7 @@ func (x *PayInfoResp) String() string { func (*PayInfoResp) ProtoMessage() {} func (x *PayInfoResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[1] + mi := &file_pay_pay_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -96,7 +183,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{1} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{3} } func (x *PayInfoResp) GetInfo() *DBPayDaily { @@ -118,7 +205,7 @@ type PayDailyBuyReq struct { func (x *PayDailyBuyReq) Reset() { *x = PayDailyBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[2] + mi := &file_pay_pay_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +218,7 @@ func (x *PayDailyBuyReq) String() string { func (*PayDailyBuyReq) ProtoMessage() {} func (x *PayDailyBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[2] + mi := &file_pay_pay_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +231,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{2} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{4} } func (x *PayDailyBuyReq) GetId() int32 { @@ -166,7 +253,7 @@ type PayDailyBuyResp struct { func (x *PayDailyBuyResp) Reset() { *x = PayDailyBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[3] + mi := &file_pay_pay_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -179,7 +266,7 @@ func (x *PayDailyBuyResp) String() string { func (*PayDailyBuyResp) ProtoMessage() {} func (x *PayDailyBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[3] + mi := &file_pay_pay_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -192,7 +279,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{3} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{5} } func (x *PayDailyBuyResp) GetIsucc() bool { @@ -223,7 +310,7 @@ type PayShippedPush struct { func (x *PayShippedPush) Reset() { *x = PayShippedPush{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[4] + mi := &file_pay_pay_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -236,7 +323,7 @@ func (x *PayShippedPush) String() string { func (*PayShippedPush) ProtoMessage() {} func (x *PayShippedPush) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[4] + mi := &file_pay_pay_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -249,7 +336,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{4} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{6} } func (x *PayShippedPush) GetPid() string { @@ -287,7 +374,7 @@ type PayDeliveryReq struct { func (x *PayDeliveryReq) Reset() { *x = PayDeliveryReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[5] + mi := &file_pay_pay_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -300,7 +387,7 @@ func (x *PayDeliveryReq) String() string { func (*PayDeliveryReq) ProtoMessage() {} func (x *PayDeliveryReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[5] + mi := &file_pay_pay_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -313,7 +400,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{5} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{7} } func (x *PayDeliveryReq) GetUid() string { @@ -350,7 +437,7 @@ type PayDeliveryResp struct { func (x *PayDeliveryResp) Reset() { *x = PayDeliveryResp{} 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) } @@ -363,7 +450,7 @@ func (x *PayDeliveryResp) String() string { func (*PayDeliveryResp) ProtoMessage() {} func (x *PayDeliveryResp) 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 { @@ -376,7 +463,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{6} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{8} } func (x *PayDeliveryResp) GetCode() ErrorCode { @@ -400,34 +487,39 @@ var file_pay_pay_msg_proto_rawDesc = []byte{ 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x70, 0x61, 0x79, 0x2f, 0x70, 0x61, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 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, 0x4a, 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, 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, 0x5f, - 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, - 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, - 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, 0x21, 0x0a, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, + 0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x52, 0x65, 0x63, 0x6f, 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, 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, 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, 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, - 0x5a, 0x0a, 0x0e, 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, 0x22, 0x43, 0x0a, 0x0f, 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, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x50, 0x75, 0x73, + 0x68, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x70, 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, 0x21, 0x0a, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 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, 0x5a, 0x0a, 0x0e, 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, 0x22, 0x43, 0x0a, 0x0f, + 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -442,29 +534,33 @@ 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, 7) +var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_pay_pay_msg_proto_goTypes = []interface{}{ - (*PayInfoReq)(nil), // 0: PayInfoReq - (*PayInfoResp)(nil), // 1: PayInfoResp - (*PayDailyBuyReq)(nil), // 2: PayDailyBuyReq - (*PayDailyBuyResp)(nil), // 3: PayDailyBuyResp - (*PayShippedPush)(nil), // 4: PayShippedPush - (*PayDeliveryReq)(nil), // 5: PayDeliveryReq - (*PayDeliveryResp)(nil), // 6: PayDeliveryResp - (*DBPayDaily)(nil), // 7: DBPayDaily - (*UserAssets)(nil), // 8: UserAssets - (ErrorCode)(0), // 9: ErrorCode + (*PayRecordReq)(nil), // 0: PayRecordReq + (*PayRecordResp)(nil), // 1: PayRecordResp + (*PayInfoReq)(nil), // 2: PayInfoReq + (*PayInfoResp)(nil), // 3: PayInfoResp + (*PayDailyBuyReq)(nil), // 4: PayDailyBuyReq + (*PayDailyBuyResp)(nil), // 5: PayDailyBuyResp + (*PayShippedPush)(nil), // 6: PayShippedPush + (*PayDeliveryReq)(nil), // 7: PayDeliveryReq + (*PayDeliveryResp)(nil), // 8: PayDeliveryResp + (*DBUserPay)(nil), // 9: DBUserPay + (*DBPayDaily)(nil), // 10: DBPayDaily + (*UserAssets)(nil), // 11: UserAssets + (ErrorCode)(0), // 12: ErrorCode } var file_pay_pay_msg_proto_depIdxs = []int32{ - 7, // 0: PayInfoResp.info:type_name -> DBPayDaily - 8, // 1: PayDailyBuyResp.items:type_name -> UserAssets - 8, // 2: PayShippedPush.items:type_name -> UserAssets - 9, // 3: PayDeliveryResp.code:type_name -> ErrorCode - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 9, // 0: PayRecordResp.info:type_name -> DBUserPay + 10, // 1: PayInfoResp.info:type_name -> DBPayDaily + 11, // 2: PayDailyBuyResp.items:type_name -> UserAssets + 11, // 3: PayShippedPush.items:type_name -> UserAssets + 12, // 4: PayDeliveryResp.code:type_name -> ErrorCode + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_pay_pay_msg_proto_init() } @@ -477,7 +573,7 @@ func file_pay_pay_msg_proto_init() { file_errorcode_proto_init() if !protoimpl.UnsafeEnabled { file_pay_pay_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayInfoReq); i { + switch v := v.(*PayRecordReq); i { case 0: return &v.state case 1: @@ -489,7 +585,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayInfoResp); i { + switch v := v.(*PayRecordResp); i { case 0: return &v.state case 1: @@ -501,7 +597,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDailyBuyReq); i { + switch v := v.(*PayInfoReq); i { case 0: return &v.state case 1: @@ -513,7 +609,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDailyBuyResp); i { + switch v := v.(*PayInfoResp); i { case 0: return &v.state case 1: @@ -525,7 +621,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayShippedPush); i { + switch v := v.(*PayDailyBuyReq); i { case 0: return &v.state case 1: @@ -537,7 +633,7 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PayDeliveryReq); i { + switch v := v.(*PayDailyBuyResp); i { case 0: return &v.state case 1: @@ -549,6 +645,30 @@ func file_pay_pay_msg_proto_init() { } } file_pay_pay_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayShippedPush); 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[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayDeliveryReq); 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[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PayDeliveryResp); i { case 0: return &v.state @@ -567,7 +687,7 @@ func file_pay_pay_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pay_pay_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 9, NumExtensions: 0, NumServices: 0, },