From 2faf0b6c3740a5e278f609da5a474734ba751427 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 21 Nov 2023 17:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 +- modules/gm/module.go | 44 +-- modules/pay/api_createorder.go | 44 +++ modules/pay/api_dailybuy.go | 2 +- modules/pay/api_delivery.go | 16 +- modules/pay/model.go | 57 ++++ modules/pay/modelPay.go | 51 --- modules/pay/module.go | 164 ++------- pb/pay_db.pb.go | 368 +++++++++++++++------ pb/pay_msg.pb.go | 585 ++++++++++++++++++++++++--------- 10 files changed, 866 insertions(+), 467 deletions(-) create mode 100644 modules/pay/api_createorder.go create mode 100644 modules/pay/model.go delete mode 100644 modules/pay/modelPay.go diff --git a/comm/imodule.go b/comm/imodule.go index 539b8fe35..0fcf597e9 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -454,7 +454,7 @@ type ( //支付模块 IPay interface { //模拟发货 - ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) + // ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) IActivityNotice } diff --git a/modules/gm/module.go b/modules/gm/module.go index 67a35e743..e3d518c17 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -366,29 +366,29 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er log.Field{Key: "N", Value: int32(num)}, ) } else if len(datas) == 2 && (datas[0] == "recharge") { // 充值次数 - module1, err := this.service.GetModule(comm.ModulePay) - if err != nil { - return - } - num, err := strconv.Atoi(datas[1]) - if err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - } - return - } - for i := 0; i < num; i++ { - if errdata = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil { - return - } - } + // module1, err := this.service.GetModule(comm.ModulePay) + // if err != nil { + // return + // } + // num, err := strconv.Atoi(datas[1]) + // if err != nil { + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_ReqParameterError, + // Title: pb.ErrorCode_ReqParameterError.ToString(), + // } + // return + // } + // for i := 0; i < num; i++ { + // if errdata = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil { + // return + // } + // } - this.Debug("使用bingo命令:uid = %s ", - log.Field{Key: "uid", Value: session.GetUserId()}, - log.Field{Key: "0", Value: datas[0]}, - log.Field{Key: "N", Value: int32(num)}, - ) + // this.Debug("使用bingo命令:uid = %s ", + // log.Field{Key: "uid", Value: session.GetUserId()}, + // log.Field{Key: "0", Value: datas[0]}, + // log.Field{Key: "N", Value: int32(num)}, + // ) } else if len(datas) == 1 && (datas[0] == "cleanitem") { // 充值次数 module1, err := this.service.GetModule(comm.ModuleItems) if err != nil { diff --git a/modules/pay/api_createorder.go b/modules/pay/api_createorder.go new file mode 100644 index 000000000..0f9ff0402 --- /dev/null +++ b/modules/pay/api_createorder.go @@ -0,0 +1,44 @@ +package pay + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "time" + + "go.mongodb.org/mongo-driver/bson/primitive" +) + +// 参数校验 +func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.PayCreateOrderReq) (errdata *pb.ErrorData) { + + return +} + +// /获取系统公告 +func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.PayCreateOrderReq) (errdata *pb.ErrorData) { + var ( + order *pb.DBPayOrder + err error + ) + if errdata = this.CreateOrderCheck(session, req); errdata != nil { + return + } + + order = &pb.DBPayOrder{ + Orderid: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + Bpoints: req.BillingPoints, + Ctime: time.Now().Unix(), + State: pb.DBPayOrderState_PayOrder_Unpaid, + Ptype: req.Ptype, + Pid: req.Pid, + } + if err = this.module.model.create(order); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + } + session.SendMsg(string(this.module.GetType()), "createorder", &pb.PayCreateOrderResp{Order: order}) + return +} diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index dae4a748d..dc5c437fb 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -18,7 +18,7 @@ func (this *apiComp) DailyBuyCheck(session comm.IUserSession, req *pb.PayDailyBu return } -// /获取系统公告 +//发货请求 func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) (errdata *pb.ErrorData) { var ( info *pb.DBPayDaily diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index ae114fbbc..2092c7a92 100644 --- a/modules/pay/api_delivery.go +++ b/modules/pay/api_delivery.go @@ -7,17 +7,15 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "math" - - "go.mongodb.org/mongo-driver/bson/primitive" ) -// 参数校验 +//参数校验 func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) { return } -// /模拟充值 +//模拟充值 func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) { var ( conf *cfg.GameRechargeData @@ -29,9 +27,6 @@ func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) if errdata = this.DeliveryCheck(session, req); errdata != nil { return } - req.Orderid = primitive.NewObjectID().Hex() - req.Uid = session.GetUserId() - if conf, err = this.module.configure.getGameRecharge(req.Productid); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -61,9 +56,12 @@ func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) if errdata = this.module.ConsumeRes(session, needatn, true); errdata != nil { return } - if err = this.module.Rpc_ModulePayDelivery(context.Background(), req, &pb.PayDeliveryResp{}); err != nil { - this.module.Errorln(err) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "delivery", &pb.PayDeliveryResp{}) diff --git a/modules/pay/model.go b/modules/pay/model.go new file mode 100644 index 000000000..709fabae0 --- /dev/null +++ b/modules/pay/model.go @@ -0,0 +1,57 @@ +package pay + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +///论坛 数据组件 +type modelComp struct { + modules.MCompModel + module *Pay +} + +//组件初始化接口 +func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { + this.MCompModel.Init(service, module, comp, opt) + this.module = module.(*Pay) + this.TableName = comm.TablePay + //创建uid索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +//查询用户重置数据 +func (this *modelComp) getmodel(oid string) (order *pb.DBPayOrder, err error) { + order = &pb.DBPayOrder{} + if err = this.DBModel.DB.FindOne(core.SqlTable(this.TableName), bson.M{"_id": oid}).Decode(order); err != nil { + this.module.Errorln(err) + } + return +} + +//添加用户订单数据 +func (this *modelComp) create(order *pb.DBPayOrder) (err error) { + if _, err = this.DBModel.DB.InsertOne(core.SqlTable(this.TableName), order); err != nil { + this.module.Errorln(err) + } + return +} + +//添加用户订单数据 +func (this *modelComp) updateState(oid string, state pb.DBPayOrderState) (err error) { + if _, err = this.DBModel.DB.UpdateOne(core.SqlTable(this.TableName), bson.M{"_id": oid}, bson.M{ + "$set": bson.M{"state": state}, + }); err != nil { + this.module.Errorln(err) + } + return +} diff --git a/modules/pay/modelPay.go b/modules/pay/modelPay.go deleted file mode 100644 index 36e5b2f48..000000000 --- a/modules/pay/modelPay.go +++ /dev/null @@ -1,51 +0,0 @@ -package pay - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/lego/sys/mgo" - "go_dreamfactory/modules" - "go_dreamfactory/pb" - - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/x/bsonx" -) - -///论坛 数据组件 -type modelPayComp struct { - modules.MCompModel - module *Pay -} - -//组件初始化接口 -func (this *modelPayComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { - this.MCompModel.Init(service, module, comp, opt) - this.module = module.(*Pay) - this.TableName = comm.TablePay - //创建uid索引 - this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, - }) - return -} - -//查询用户重置数据 -func (this *modelPayComp) queryUserPayData(uId string) (result []*pb.DBPayOrder, err error) { - result = make([]*pb.DBPayOrder, 0) - if err = this.GetList(uId, &result); err != nil && err != mgo.MongodbNil { - this.module.Errorf("err:%v", err) - } - if err == mgo.MongodbNil { - err = nil - } - return -} - -//添加用户订单数据 -func (this *modelPayComp) addUserPayOrder(order *pb.DBPayOrder) (err error) { - if err = this.AddList(order.Uid, order.Orderid, order); err != nil { - this.module.Errorf("err:%v", err) - return - } - return -} diff --git a/modules/pay/module.go b/modules/pay/module.go index 5d2e3a67e..b5ae01eb3 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -8,10 +8,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "go.mongodb.org/mongo-driver/bson/primitive" ) /* @@ -28,7 +25,7 @@ type Pay struct { modules.ModuleBase service base.IRPCXService api *apiComp - modelPay *modelPayComp + model *modelComp modelPayUser *modelPayUserComp modelDaily *modelDailyComp modelActivity *modelActivityComp //活动礼包 @@ -87,7 +84,7 @@ func (this *Pay) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - this.modelPay = this.RegisterComp(new(modelPayComp)).(*modelPayComp) + this.model = this.RegisterComp(new(modelComp)).(*modelComp) this.modelPayUser = this.RegisterComp(new(modelPayUserComp)).(*modelPayUserComp) this.modelDaily = this.RegisterComp(new(modelDailyComp)).(*modelDailyComp) this.modelActivity = this.RegisterComp(new(modelActivityComp)).(*modelActivityComp) @@ -98,6 +95,7 @@ func (this *Pay) OnInstallComp() { func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDeliveryReq, reply *pb.PayDeliveryResp) (err error) { this.Debug("Rpc_ModulePayDelivery", log.Field{Key: "args", Value: args.String()}) var ( + order *pb.DBPayOrder conf *cfg.GameRechargeData info *pb.DBUserPay res []*cfg.Gameatn @@ -107,81 +105,84 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery online bool ) - if conf, err = this.configure.getGameRecharge(args.Productid); err != nil { + if order, err = this.model.getmodel(args.Orderid); err != nil { + return + } + + if conf, err = this.configure.getGameRecharge(order.Bpoints); err != nil { reply.Code = pb.ErrorCode_ConfigNoFound return } - if info, err = this.modelPayUser.queryUserPay(args.Uid); err != nil { + if info, err = this.modelPayUser.queryUserPay(order.Uid); err != nil { reply.Code = pb.ErrorCode_DBError return } - if info.Record[args.Productid] > 0 { + if info.Record[order.Bpoints] > 0 { res = conf.Vipexp } else { res = conf.DiamondNumDouble } res = append(res, &cfg.Gameatn{A: comm.AttrType, T: comm.Integral, N: conf.Integral}) - info.Record[args.Productid]++ + info.Record[order.Bpoints]++ defer func() { this.PutUserSession(session) }() - if session, online = this.GetUserSession(args.Uid); online { + if session, online = this.GetUserSession(order.Uid); online { if errdata = this.DispenseRes(session, res, true); errdata != nil { reply.Code = errdata.Code + reply.Msg = errdata.Message return } } else { if errdata = this.DispenseRes(session, res, false); errdata != nil { reply.Code = errdata.Code + reply.Msg = errdata.Message return } } - if err = this.modelPay.addUserPayOrder(&pb.DBPayOrder{ - Orderid: args.Orderid, - Uid: args.Uid, - Productid: args.Productid, - Ctime: configure.Now().Unix(), - }); err != nil { + order.State = pb.DBPayOrderState_PayOrder_Paid + if err = this.model.updateState(order.Orderid, order.State); err != nil { reply.Code = pb.ErrorCode_DBError + reply.Msg = err.Error() return } this.modelPayUser.updateUserPay(info) - switch conf.RechargeType { - case 1: + switch order.Ptype { + case pb.DBPayType_DiamondShop: break - case 2: + case pb.DBPayType_Packs: if errdata, items = this.modelDaily.delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return } break - case 3: + case pb.DBPayType_MonthlyPass: if errdata, items = this.privilege.Delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return } break - case 4: + case pb.DBPayType_PeachBattlePass: if errdata, items = this.warorder.Delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return } break - case 5: + case pb.DBPayType_PeachRecharge: if errdata, items = this.modelActivity.delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return } break - case 6: + case pb.DBPayType_ActivityFunds: if errdata, items = this.shopcenter.Delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return } break - case 7: + case pb.DBPayType_PushgiftBag: if errdata, items = this.pushgiftbag.Delivery(session, args.Productid); errdata != nil { reply.Code = errdata.Code return @@ -193,10 +194,9 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery items = append(items, &pb.UserAssets{A: v.A, T: v.T, N: v.N}) } session.SendMsg(string(this.GetType()), "shipped", &pb.PayShippedPush{ - Pid: args.Productid, - Orderid: args.Orderid, - Items: items, - Info: info, + Order: order, + Items: items, + Info: info, }) if online { if err = session.Push(); err != nil { @@ -212,114 +212,6 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery return } -// 发货 -func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) { - var ( - conf *cfg.GameRechargeData - info *pb.DBUserPay - res []*cfg.Gameatn - items []*pb.UserAssets - err error - online bool - ) - - if conf, err = this.configure.getGameRecharge(Productid); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - if info, err = this.modelPayUser.queryUserPay(session.GetUserId()); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } - this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分 - if info.Record[Productid] > 0 { - res = conf.Vipexp - } else { - res = conf.DiamondNumDouble - } - info.Record[Productid]++ - - if errdata = this.DispenseRes(session, res, true); errdata != nil { - return - } - orderid := primitive.NewObjectID().Hex() - if err = this.modelPay.addUserPayOrder(&pb.DBPayOrder{ - Orderid: orderid, - Uid: session.GetUserId(), - Productid: Productid, - Ctime: configure.Now().Unix(), - }); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } - this.modelPayUser.updateUserPay(info) - - switch conf.RechargeType { - case 1: - break - case 2: //每日礼包 - if errdata, items = this.modelDaily.delivery(session, Productid); errdata != nil { - return - } - break - case 3: //月卡 - if errdata, items = this.privilege.Delivery(session, Productid); errdata != nil { - return - } - break - case 4: //战令 - if errdata, items = this.warorder.Delivery(session, Productid); errdata != nil { - return - } - break - case 5: //活动充值礼包 - if errdata, items = this.modelActivity.delivery(session, Productid); errdata != nil { - return - } - break - case 6: //购物中心 - if errdata, items = this.shopcenter.Delivery(session, Productid); errdata != nil { - return - } - case 7: - if errdata, items = this.pushgiftbag.Delivery(session, Productid); errdata != nil { - return - } - break - } - for _, v := range res { - items = append(items, &pb.UserAssets{A: v.A, T: v.T, N: v.N}) - } - session.SendMsg(string(this.GetType()), "shipped", &pb.PayShippedPush{ - Pid: Productid, - Orderid: orderid, - Items: items, - Info: info, - }) - if online { - if err = session.Push(); err != nil { - this.Errorln(err) - return - } - } - go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "ModulePayDelivery", res) - }) - return -} - func (this *Pay) ActivityOpenNotice(hdlist *pb.DBHuodong) { switch hdlist.Itype { case pb.HdType_HdTypePay: diff --git a/pb/pay_db.pb.go b/pb/pay_db.pb.go index 8ba4cadee..d8949ef23 100644 --- a/pb/pay_db.pb.go +++ b/pb/pay_db.pb.go @@ -20,16 +20,140 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +//支付类型 +type DBPayType int32 + +const ( + DBPayType_DiamondShop DBPayType = 0 //1.常规充值 + DBPayType_Packs DBPayType = 1 //2.常规礼包（每日每周每月俩包） + DBPayType_MonthlyPass DBPayType = 2 //3.各种月卡 + DBPayType_PeachBattlePass DBPayType = 3 //4.圣桃战令 + DBPayType_PeachRecharge DBPayType = 4 //5.圣桃限时充值 + DBPayType_ActivityFunds DBPayType = 5 //6.活动基金 + DBPayType_PushgiftBag DBPayType = 6 //7.推送礼包 + DBPayType_IsLandBattlePass DBPayType = 7 //8.推送礼包 +) + +// Enum value maps for DBPayType. +var ( + DBPayType_name = map[int32]string{ + 0: "DiamondShop", + 1: "Packs", + 2: "MonthlyPass", + 3: "PeachBattlePass", + 4: "PeachRecharge", + 5: "ActivityFunds", + 6: "PushgiftBag", + 7: "IsLandBattlePass", + } + DBPayType_value = map[string]int32{ + "DiamondShop": 0, + "Packs": 1, + "MonthlyPass": 2, + "PeachBattlePass": 3, + "PeachRecharge": 4, + "ActivityFunds": 5, + "PushgiftBag": 6, + "IsLandBattlePass": 7, + } +) + +func (x DBPayType) Enum() *DBPayType { + p := new(DBPayType) + *p = x + return p +} + +func (x DBPayType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (DBPayType) Descriptor() protoreflect.EnumDescriptor { + return file_pay_pay_db_proto_enumTypes[0].Descriptor() +} + +func (DBPayType) Type() protoreflect.EnumType { + return &file_pay_pay_db_proto_enumTypes[0] +} + +func (x DBPayType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use DBPayType.Descriptor instead. +func (DBPayType) EnumDescriptor() ([]byte, []int) { + return file_pay_pay_db_proto_rawDescGZIP(), []int{0} +} + +//订单状态 +type DBPayOrderState int32 + +const ( + DBPayOrderState_PayOrder_Unpaid DBPayOrderState = 0 //未支付 + DBPayOrderState_PayOrder_Paid DBPayOrderState = 1 //已支付 + DBPayOrderState_PayOrder_Finish DBPayOrderState = 2 //完成 + DBPayOrderState_PayOrder_Cancel DBPayOrderState = 3 //取消 + DBPayOrderState_PayOrder_Fail DBPayOrderState = 4 //失败 +) + +// Enum value maps for DBPayOrderState. +var ( + DBPayOrderState_name = map[int32]string{ + 0: "PayOrder_Unpaid", + 1: "PayOrder_Paid", + 2: "PayOrder_Finish", + 3: "PayOrder_Cancel", + 4: "PayOrder_Fail", + } + DBPayOrderState_value = map[string]int32{ + "PayOrder_Unpaid": 0, + "PayOrder_Paid": 1, + "PayOrder_Finish": 2, + "PayOrder_Cancel": 3, + "PayOrder_Fail": 4, + } +) + +func (x DBPayOrderState) Enum() *DBPayOrderState { + p := new(DBPayOrderState) + *p = x + return p +} + +func (x DBPayOrderState) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (DBPayOrderState) Descriptor() protoreflect.EnumDescriptor { + return file_pay_pay_db_proto_enumTypes[1].Descriptor() +} + +func (DBPayOrderState) Type() protoreflect.EnumType { + return &file_pay_pay_db_proto_enumTypes[1] +} + +func (x DBPayOrderState) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use DBPayOrderState.Descriptor instead. +func (DBPayOrderState) EnumDescriptor() ([]byte, []int) { + return file_pay_pay_db_proto_rawDescGZIP(), []int{1} +} + //支付订单数据表 type DBPayOrder struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Orderid string `protobuf:"bytes,1,opt,name=orderid,proto3" json:"orderid"` - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Productid string `protobuf:"bytes,3,opt,name=productid,proto3" json:"productid"` - Ctime int64 `protobuf:"varint,4,opt,name=ctime,proto3" json:"ctime"` + Orderid string `protobuf:"bytes,1,opt,name=orderid,proto3" json:"orderid" bson:"_id"` //唯一ID 订单号 + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //uid + Bpoints string `protobuf:"bytes,3,opt,name=bpoints,proto3" json:"bpoints"` //计费点 + Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` //创建时间 + State DBPayOrderState `protobuf:"varint,6,opt,name=state,proto3,enum=DBPayOrderState" json:"state"` //订单状态 + Ptype DBPayType `protobuf:"varint,7,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"` //订单类型 + Pid int32 `protobuf:"varint,8,opt,name=pid,proto3" json:"pid"` //商品id } func (x *DBPayOrder) Reset() { @@ -78,9 +202,9 @@ func (x *DBPayOrder) GetUid() string { return "" } -func (x *DBPayOrder) GetProductid() string { +func (x *DBPayOrder) GetBpoints() string { if x != nil { - return x.Productid + return x.Bpoints } return "" } @@ -92,6 +216,27 @@ func (x *DBPayOrder) GetCtime() int64 { return 0 } +func (x *DBPayOrder) GetState() DBPayOrderState { + if x != nil { + return x.State + } + return DBPayOrderState_PayOrder_Unpaid +} + +func (x *DBPayOrder) GetPtype() DBPayType { + if x != nil { + return x.Ptype + } + return DBPayType_DiamondShop +} + +func (x *DBPayOrder) GetPid() int32 { + if x != nil { + return x.Pid + } + return 0 +} + //用户购买记录 type DBUserPay struct { state protoimpl.MessageState @@ -472,73 +617,96 @@ var File_pay_pay_db_proto protoreflect.FileDescriptor var file_pay_pay_db_proto_rawDesc = []byte{ 0x0a, 0x10, 0x70, 0x61, 0x79, 0x2f, 0x70, 0x61, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x6c, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x63, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x0c, 0x50, - 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, - 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, - 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, - 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, - 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, - 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, - 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, - 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, - 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, - 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, 0x52, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 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, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, - 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, - 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, - 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, - 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, - 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, - 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, - 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, - 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, - 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, - 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, - 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, - 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, - 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x62, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x62, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, + 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x44, + 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, + 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, 0x08, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42, + 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, + 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, + 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, + 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x2c, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, + 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, + 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f, + 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, + 0x66, 0x74, 0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, + 0x52, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 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, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, + 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, + 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, + 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, + 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, + 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, + 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, + 0x09, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, + 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, + 0x61, 0x63, 0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, + 0x79, 0x50, 0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, + 0x50, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, + 0x11, 0x0a, 0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, + 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, + 0x67, 0x10, 0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, + 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, + 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, + 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, + 0x69, 0x64, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x5f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, + 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, + 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -553,33 +721,38 @@ func file_pay_pay_db_proto_rawDescGZIP() []byte { return file_pay_pay_db_proto_rawDescData } +var file_pay_pay_db_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_pay_pay_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_pay_pay_db_proto_goTypes = []interface{}{ - (*DBPayOrder)(nil), // 0: DBPayOrder - (*DBUserPay)(nil), // 1: DBUserPay - (*PayDailyItem)(nil), // 2: PayDailyItem - (*DBPayDaily)(nil), // 3: DBPayDaily - (*DBActivityGiftbag)(nil), // 4: DBActivityGiftbag - (*ActivityGiftbagItem)(nil), // 5: ActivityGiftbagItem - (*PayActivityGiftbagItem)(nil), // 6: PayActivityGiftbagItem - nil, // 7: DBUserPay.RecordEntry - nil, // 8: DBPayDaily.ItemsEntry - nil, // 9: DBActivityGiftbag.ActivitysEntry - nil, // 10: ActivityGiftbagItem.ItemsEntry + (DBPayType)(0), // 0: DBPayType + (DBPayOrderState)(0), // 1: DBPayOrderState + (*DBPayOrder)(nil), // 2: DBPayOrder + (*DBUserPay)(nil), // 3: DBUserPay + (*PayDailyItem)(nil), // 4: PayDailyItem + (*DBPayDaily)(nil), // 5: DBPayDaily + (*DBActivityGiftbag)(nil), // 6: DBActivityGiftbag + (*ActivityGiftbagItem)(nil), // 7: ActivityGiftbagItem + (*PayActivityGiftbagItem)(nil), // 8: PayActivityGiftbagItem + nil, // 9: DBUserPay.RecordEntry + nil, // 10: DBPayDaily.ItemsEntry + nil, // 11: DBActivityGiftbag.ActivitysEntry + nil, // 12: ActivityGiftbagItem.ItemsEntry } var file_pay_pay_db_proto_depIdxs = []int32{ - 7, // 0: DBUserPay.record:type_name -> DBUserPay.RecordEntry - 8, // 1: DBPayDaily.items:type_name -> DBPayDaily.ItemsEntry - 9, // 2: DBActivityGiftbag.activitys:type_name -> DBActivityGiftbag.ActivitysEntry - 10, // 3: ActivityGiftbagItem.items:type_name -> ActivityGiftbagItem.ItemsEntry - 2, // 4: DBPayDaily.ItemsEntry.value:type_name -> PayDailyItem - 5, // 5: DBActivityGiftbag.ActivitysEntry.value:type_name -> ActivityGiftbagItem - 6, // 6: ActivityGiftbagItem.ItemsEntry.value:type_name -> PayActivityGiftbagItem - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 1, // 0: DBPayOrder.state:type_name -> DBPayOrderState + 0, // 1: DBPayOrder.ptype:type_name -> DBPayType + 9, // 2: DBUserPay.record:type_name -> DBUserPay.RecordEntry + 10, // 3: DBPayDaily.items:type_name -> DBPayDaily.ItemsEntry + 11, // 4: DBActivityGiftbag.activitys:type_name -> DBActivityGiftbag.ActivitysEntry + 12, // 5: ActivityGiftbagItem.items:type_name -> ActivityGiftbagItem.ItemsEntry + 4, // 6: DBPayDaily.ItemsEntry.value:type_name -> PayDailyItem + 7, // 7: DBActivityGiftbag.ActivitysEntry.value:type_name -> ActivityGiftbagItem + 8, // 8: ActivityGiftbagItem.ItemsEntry.value:type_name -> PayActivityGiftbagItem + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_pay_pay_db_proto_init() } @@ -678,13 +851,14 @@ func file_pay_pay_db_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pay_pay_db_proto_rawDesc, - NumEnums: 0, + NumEnums: 2, NumMessages: 11, NumExtensions: 0, NumServices: 0, }, GoTypes: file_pay_pay_db_proto_goTypes, DependencyIndexes: file_pay_pay_db_proto_depIdxs, + EnumInfos: file_pay_pay_db_proto_enumTypes, MessageInfos: file_pay_pay_db_proto_msgTypes, }.Build() File_pay_pay_db_proto = out.File diff --git a/pb/pay_msg.pb.go b/pb/pay_msg.pb.go index b1f5bbd06..421293a9e 100644 --- a/pb/pay_msg.pb.go +++ b/pb/pay_msg.pb.go @@ -20,6 +20,222 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +//创建订单号请求 +type PayCreateOrderReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Ptype DBPayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"` + Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"` + BillingPoints string `protobuf:"bytes,3,opt,name=BillingPoints,proto3" json:"BillingPoints"` +} + +func (x *PayCreateOrderReq) Reset() { + *x = PayCreateOrderReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayCreateOrderReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayCreateOrderReq) ProtoMessage() {} + +func (x *PayCreateOrderReq) 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 PayCreateOrderReq.ProtoReflect.Descriptor instead. +func (*PayCreateOrderReq) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{0} +} + +func (x *PayCreateOrderReq) GetPtype() DBPayType { + if x != nil { + return x.Ptype + } + return DBPayType_DiamondShop +} + +func (x *PayCreateOrderReq) GetPid() int32 { + if x != nil { + return x.Pid + } + return 0 +} + +func (x *PayCreateOrderReq) GetBillingPoints() string { + if x != nil { + return x.BillingPoints + } + return "" +} + +//创建订单号请求 +type PayCreateOrderResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"` +} + +func (x *PayCreateOrderResp) Reset() { + *x = PayCreateOrderResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayCreateOrderResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayCreateOrderResp) ProtoMessage() {} + +func (x *PayCreateOrderResp) 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 PayCreateOrderResp.ProtoReflect.Descriptor instead. +func (*PayCreateOrderResp) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *PayCreateOrderResp) GetOrder() *DBPayOrder { + if x != nil { + return x.Order + } + return nil +} + +//取消订单号请求 +type PayResponseOrderReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` + State DBPayOrderState `protobuf:"varint,2,opt,name=State,proto3,enum=DBPayOrderState" json:"State"` +} + +func (x *PayResponseOrderReq) Reset() { + *x = PayResponseOrderReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayResponseOrderReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayResponseOrderReq) ProtoMessage() {} + +func (x *PayResponseOrderReq) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[2] + 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 PayResponseOrderReq.ProtoReflect.Descriptor instead. +func (*PayResponseOrderReq) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *PayResponseOrderReq) GetOid() string { + if x != nil { + return x.Oid + } + return "" +} + +func (x *PayResponseOrderReq) GetState() DBPayOrderState { + if x != nil { + return x.State + } + return DBPayOrderState_PayOrder_Unpaid +} + +//取消订单号请求 +type PayResponseOrderResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` +} + +func (x *PayResponseOrderResp) Reset() { + *x = PayResponseOrderResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PayResponseOrderResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PayResponseOrderResp) ProtoMessage() {} + +func (x *PayResponseOrderResp) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[3] + 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 PayResponseOrderResp.ProtoReflect.Descriptor instead. +func (*PayResponseOrderResp) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *PayResponseOrderResp) GetOid() string { + if x != nil { + return x.Oid + } + return "" +} + //充值记录 type PayRecordReq struct { state protoimpl.MessageState @@ -30,7 +246,7 @@ type PayRecordReq struct { func (x *PayRecordReq) Reset() { *x = PayRecordReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[0] + mi := &file_pay_pay_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -43,7 +259,7 @@ func (x *PayRecordReq) String() string { func (*PayRecordReq) ProtoMessage() {} func (x *PayRecordReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[0] + mi := &file_pay_pay_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -56,7 +272,7 @@ func (x *PayRecordReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PayRecordReq.ProtoReflect.Descriptor instead. func (*PayRecordReq) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{0} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{4} } //充值记录 @@ -71,7 +287,7 @@ type PayRecordResp struct { func (x *PayRecordResp) Reset() { *x = PayRecordResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[1] + mi := &file_pay_pay_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -84,7 +300,7 @@ func (x *PayRecordResp) String() string { func (*PayRecordResp) ProtoMessage() {} func (x *PayRecordResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[1] + mi := &file_pay_pay_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -97,7 +313,7 @@ func (x *PayRecordResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PayRecordResp.ProtoReflect.Descriptor instead. func (*PayRecordResp) Descriptor() ([]byte, []int) { - return file_pay_pay_msg_proto_rawDescGZIP(), []int{1} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{5} } func (x *PayRecordResp) GetInfo() *DBUserPay { @@ -117,7 +333,7 @@ type PayInfoReq struct { func (x *PayInfoReq) Reset() { *x = PayInfoReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[2] + mi := &file_pay_pay_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -130,7 +346,7 @@ func (x *PayInfoReq) String() string { func (*PayInfoReq) ProtoMessage() {} func (x *PayInfoReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[2] + mi := &file_pay_pay_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -143,7 +359,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{2} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{6} } type PayInfoResp struct { @@ -157,7 +373,7 @@ type PayInfoResp struct { func (x *PayInfoResp) Reset() { *x = PayInfoResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[3] + mi := &file_pay_pay_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -170,7 +386,7 @@ func (x *PayInfoResp) String() string { func (*PayInfoResp) ProtoMessage() {} func (x *PayInfoResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[3] + mi := &file_pay_pay_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -183,7 +399,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{3} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{7} } func (x *PayInfoResp) GetInfo() *DBPayDaily { @@ -205,7 +421,7 @@ type PayDailyBuyReq struct { func (x *PayDailyBuyReq) Reset() { *x = PayDailyBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[4] + mi := &file_pay_pay_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -218,7 +434,7 @@ func (x *PayDailyBuyReq) String() string { func (*PayDailyBuyReq) ProtoMessage() {} func (x *PayDailyBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[4] + mi := &file_pay_pay_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -231,7 +447,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{4} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{8} } func (x *PayDailyBuyReq) GetId() int32 { @@ -253,7 +469,7 @@ type PayDailyBuyResp struct { func (x *PayDailyBuyResp) Reset() { *x = PayDailyBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[5] + mi := &file_pay_pay_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -266,7 +482,7 @@ func (x *PayDailyBuyResp) String() string { func (*PayDailyBuyResp) ProtoMessage() {} func (x *PayDailyBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[5] + mi := &file_pay_pay_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -279,7 +495,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{5} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{9} } func (x *PayDailyBuyResp) GetIsucc() bool { @@ -302,16 +518,15 @@ type PayShippedPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Pid string `protobuf:"bytes,1,opt,name=pid,proto3" json:"pid"` - Orderid string `protobuf:"bytes,2,opt,name=orderid,proto3" json:"orderid"` - Items []*UserAssets `protobuf:"bytes,3,rep,name=items,proto3" json:"items"` - Info *DBUserPay `protobuf:"bytes,4,opt,name=info,proto3" json:"info"` + Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"` + Items []*UserAssets `protobuf:"bytes,2,rep,name=items,proto3" json:"items"` + Info *DBUserPay `protobuf:"bytes,4,opt,name=info,proto3" json:"info"` } func (x *PayShippedPush) Reset() { *x = PayShippedPush{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[6] + mi := &file_pay_pay_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -324,7 +539,7 @@ func (x *PayShippedPush) String() string { func (*PayShippedPush) ProtoMessage() {} func (x *PayShippedPush) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[6] + mi := &file_pay_pay_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -337,21 +552,14 @@ 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{6} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{10} } -func (x *PayShippedPush) GetPid() string { +func (x *PayShippedPush) GetOrder() *DBPayOrder { if x != nil { - return x.Pid + return x.Order } - return "" -} - -func (x *PayShippedPush) GetOrderid() string { - if x != nil { - return x.Orderid - } - return "" + return nil } func (x *PayShippedPush) GetItems() []*UserAssets { @@ -384,7 +592,7 @@ type PayDeliveryReq struct { func (x *PayDeliveryReq) Reset() { *x = PayDeliveryReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[7] + mi := &file_pay_pay_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -397,7 +605,7 @@ func (x *PayDeliveryReq) String() string { func (*PayDeliveryReq) ProtoMessage() {} func (x *PayDeliveryReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[7] + mi := &file_pay_pay_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -410,7 +618,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{7} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{11} } func (x *PayDeliveryReq) GetUid() string { @@ -462,7 +670,7 @@ type PayDeliveryResp struct { func (x *PayDeliveryResp) Reset() { *x = PayDeliveryResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[8] + mi := &file_pay_pay_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -475,7 +683,7 @@ func (x *PayDeliveryResp) String() string { func (*PayDeliveryResp) ProtoMessage() {} func (x *PayDeliveryResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[8] + mi := &file_pay_pay_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -488,7 +696,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{8} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{12} } func (x *PayDeliveryResp) GetCode() ErrorCode { @@ -524,7 +732,7 @@ type PayGetActivityReq struct { func (x *PayGetActivityReq) Reset() { *x = PayGetActivityReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[9] + mi := &file_pay_pay_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -537,7 +745,7 @@ func (x *PayGetActivityReq) String() string { func (*PayGetActivityReq) ProtoMessage() {} func (x *PayGetActivityReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[9] + mi := &file_pay_pay_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -550,7 +758,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{9} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{13} } func (x *PayGetActivityReq) GetAtype() int32 { @@ -571,7 +779,7 @@ type PayGetActivityResp struct { func (x *PayGetActivityResp) Reset() { *x = PayGetActivityResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[10] + mi := &file_pay_pay_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -584,7 +792,7 @@ func (x *PayGetActivityResp) String() string { func (*PayGetActivityResp) ProtoMessage() {} func (x *PayGetActivityResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[10] + mi := &file_pay_pay_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -597,7 +805,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{10} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{14} } func (x *PayGetActivityResp) GetInfo() *ActivityGiftbagItem { @@ -619,7 +827,7 @@ type PayActivityBuyReq struct { func (x *PayActivityBuyReq) Reset() { *x = PayActivityBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[11] + mi := &file_pay_pay_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -632,7 +840,7 @@ func (x *PayActivityBuyReq) String() string { func (*PayActivityBuyReq) ProtoMessage() {} func (x *PayActivityBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[11] + mi := &file_pay_pay_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -645,7 +853,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{11} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{15} } func (x *PayActivityBuyReq) GetId() int32 { @@ -667,7 +875,7 @@ type PayActivityResp struct { func (x *PayActivityResp) Reset() { *x = PayActivityResp{} if protoimpl.UnsafeEnabled { - mi := &file_pay_pay_msg_proto_msgTypes[12] + mi := &file_pay_pay_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -680,7 +888,7 @@ func (x *PayActivityResp) String() string { func (*PayActivityResp) ProtoMessage() {} func (x *PayActivityResp) ProtoReflect() protoreflect.Message { - mi := &file_pay_pay_msg_proto_msgTypes[12] + mi := &file_pay_pay_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -693,7 +901,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{12} + return file_pay_pay_msg_proto_rawDescGZIP(), []int{16} } func (x *PayActivityResp) GetIsucc() bool { @@ -717,58 +925,76 @@ 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, 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, - 0x7f, 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, - 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, 0x88, 0x01, 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, 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, 0x57, 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, - 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 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, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x22, 0x6d, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, + 0x72, 0x64, 0x65, 0x72, 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, 0x37, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 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, 0x4f, 0x0a, 0x13, 0x50, 0x61, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6f, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x28, 0x0a, 0x14, 0x50, + 0x61, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6f, 0x69, 0x64, 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, 0x76, 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, 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, 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, 0x88, 0x01, 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, 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, 0x57, 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, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -783,41 +1009,52 @@ 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, 13) +var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_pay_pay_msg_proto_goTypes = []interface{}{ - (*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 - (*PayGetActivityReq)(nil), // 9: PayGetActivityReq - (*PayGetActivityResp)(nil), // 10: PayGetActivityResp - (*PayActivityBuyReq)(nil), // 11: PayActivityBuyReq - (*PayActivityResp)(nil), // 12: PayActivityResp - (*DBUserPay)(nil), // 13: DBUserPay - (*DBPayDaily)(nil), // 14: DBPayDaily - (*UserAssets)(nil), // 15: UserAssets - (ErrorCode)(0), // 16: ErrorCode - (*ActivityGiftbagItem)(nil), // 17: ActivityGiftbagItem + (*PayCreateOrderReq)(nil), // 0: PayCreateOrderReq + (*PayCreateOrderResp)(nil), // 1: PayCreateOrderResp + (*PayResponseOrderReq)(nil), // 2: PayResponseOrderReq + (*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 + (DBPayType)(0), // 17: DBPayType + (*DBPayOrder)(nil), // 18: DBPayOrder + (DBPayOrderState)(0), // 19: DBPayOrderState + (*DBUserPay)(nil), // 20: DBUserPay + (*DBPayDaily)(nil), // 21: DBPayDaily + (*UserAssets)(nil), // 22: UserAssets + (ErrorCode)(0), // 23: ErrorCode + (*ActivityGiftbagItem)(nil), // 24: ActivityGiftbagItem } var file_pay_pay_msg_proto_depIdxs = []int32{ - 13, // 0: PayRecordResp.info:type_name -> DBUserPay - 14, // 1: PayInfoResp.info:type_name -> DBPayDaily - 15, // 2: PayDailyBuyResp.items:type_name -> UserAssets - 15, // 3: PayShippedPush.items:type_name -> UserAssets - 13, // 4: PayShippedPush.info:type_name -> DBUserPay - 16, // 5: PayDeliveryResp.code:type_name -> ErrorCode - 17, // 6: PayGetActivityResp.info:type_name -> ActivityGiftbagItem - 15, // 7: PayActivityResp.items:type_name -> UserAssets - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 17, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType + 18, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder + 19, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState + 20, // 3: PayRecordResp.info:type_name -> DBUserPay + 21, // 4: PayInfoResp.info:type_name -> DBPayDaily + 22, // 5: PayDailyBuyResp.items:type_name -> UserAssets + 18, // 6: PayShippedPush.order:type_name -> DBPayOrder + 22, // 7: PayShippedPush.items:type_name -> UserAssets + 20, // 8: PayShippedPush.info:type_name -> DBUserPay + 23, // 9: PayDeliveryResp.code:type_name -> ErrorCode + 24, // 10: PayGetActivityResp.info:type_name -> ActivityGiftbagItem + 22, // 11: PayActivityResp.items:type_name -> UserAssets + 12, // [12:12] is the sub-list for method output_type + 12, // [12:12] is the sub-list for method input_type + 12, // [12:12] is the sub-list for extension type_name + 12, // [12:12] is the sub-list for extension extendee + 0, // [0:12] is the sub-list for field type_name } func init() { file_pay_pay_msg_proto_init() } @@ -830,7 +1067,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.(*PayRecordReq); i { + switch v := v.(*PayCreateOrderReq); i { case 0: return &v.state case 1: @@ -842,7 +1079,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.(*PayRecordResp); i { + switch v := v.(*PayCreateOrderResp); i { case 0: return &v.state case 1: @@ -854,7 +1091,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.(*PayInfoReq); i { + switch v := v.(*PayResponseOrderReq); i { case 0: return &v.state case 1: @@ -866,7 +1103,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.(*PayInfoResp); i { + switch v := v.(*PayResponseOrderResp); i { case 0: return &v.state case 1: @@ -878,7 +1115,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.(*PayDailyBuyReq); i { + switch v := v.(*PayRecordReq); i { case 0: return &v.state case 1: @@ -890,7 +1127,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.(*PayDailyBuyResp); i { + switch v := v.(*PayRecordResp); i { case 0: return &v.state case 1: @@ -902,7 +1139,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.(*PayShippedPush); i { + switch v := v.(*PayInfoReq); i { case 0: return &v.state case 1: @@ -914,7 +1151,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.(*PayDeliveryReq); i { + switch v := v.(*PayInfoResp); i { case 0: return &v.state case 1: @@ -926,7 +1163,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.(*PayDeliveryResp); i { + switch v := v.(*PayDailyBuyReq); i { case 0: return &v.state case 1: @@ -938,7 +1175,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.(*PayGetActivityReq); i { + switch v := v.(*PayDailyBuyResp); i { case 0: return &v.state case 1: @@ -950,7 +1187,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.(*PayGetActivityResp); i { + switch v := v.(*PayShippedPush); i { case 0: return &v.state case 1: @@ -962,7 +1199,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.(*PayActivityBuyReq); i { + switch v := v.(*PayDeliveryReq); i { case 0: return &v.state case 1: @@ -974,6 +1211,54 @@ 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 { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pay_pay_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayGetActivityReq); 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[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayGetActivityResp); 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[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PayActivityBuyReq); 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[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PayActivityResp); i { case 0: return &v.state @@ -992,7 +1277,7 @@ func file_pay_pay_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pay_pay_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 13, + NumMessages: 17, NumExtensions: 0, NumServices: 0, },