diff --git a/comm/imodule.go b/comm/imodule.go index a0797db20..098e32201 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -31,7 +31,7 @@ type ( } //支付发布接口 IPayDelivery interface { - Delivery(session IUserSession, pId string) (errdata *pb.ErrorData, items []*pb.UserAssets) + Delivery(session IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets) } ) diff --git a/modules/pay/configure.go b/modules/pay/configure.go index 029b1bed9..59a782cae 100644 --- a/modules/pay/configure.go +++ b/modules/pay/configure.go @@ -87,7 +87,7 @@ func (this *configureComp) getPayPackageData(id int32) (result *cfg.GamePayPacka } // 获取手动加入频道 任务限制 -func (this *configureComp) getPayPackageDataByPid(pid string) (result *cfg.GamePayPackageData, err error) { +func (this *configureComp) getPayPackageDataByPid(pid int32) (result *cfg.GamePayPackageData, err error) { var ( v interface{} ) @@ -96,7 +96,7 @@ func (this *configureComp) getPayPackageDataByPid(pid string) (result *cfg.GameP return } else { for _, v := range v.(*cfg.GamePayPackage).GetDataMap() { - if v.Packagetype == pid { + if v.Id == pid { result = v return } @@ -126,7 +126,7 @@ func (this *configureComp) getPayGiftpackeData(id int32) (result *cfg.GamePayGif } // 獲取 -func (this *configureComp) getPayGiftpackDataByPid(pid string) (result *cfg.GamePayGiftpackData, err error) { +func (this *configureComp) getPayGiftpackDataByPid(pid int32) (result *cfg.GamePayGiftpackData, err error) { var ( v interface{} ) @@ -135,7 +135,7 @@ func (this *configureComp) getPayGiftpackDataByPid(pid string) (result *cfg.Game return } else { for _, v := range v.(*cfg.GamePayGiftpack).GetDataMap() { - if v.Packagetype == pid { + if v.Id == pid { result = v return } diff --git a/modules/pay/modelActivity.go b/modules/pay/modelActivity.go index 30de953d6..cecb9cb55 100644 --- a/modules/pay/modelActivity.go +++ b/modules/pay/modelActivity.go @@ -149,7 +149,7 @@ func (this *modelActivityComp) deliverybyid(session comm.IUserSession, id int32) } // 每日礼包发货 -func (this *modelActivityComp) delivery(session comm.IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) { +func (this *modelActivityComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAssets) { var ( info *pb.DBActivityGiftbag item *pb.ActivityGiftbagItem diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index ac6fd756a..952868ed1 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -109,7 +109,7 @@ func (this *modelDailyComp) deliverybyid(session comm.IUserSession, id int32) (e } // 每日礼包发货 -func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) { +func (this *modelDailyComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAssets) { var ( info *pb.DBPayDaily conf *cfg.GamePayPackageData diff --git a/modules/pay/module.go b/modules/pay/module.go index 6d78a136d..4232f2ed2 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -153,37 +153,37 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli case pb.DBPayType_DiamondShop: break case pb.DBPayType_Packs: - if errdata, items = this.modelDaily.delivery(session, args.Productid); errdata != nil { + if errdata, items = this.modelDaily.delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return } break case pb.DBPayType_MonthlyPass: - if errdata, items = this.privilege.Delivery(session, args.Productid); errdata != nil { + if errdata, items = this.privilege.Delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return } break case pb.DBPayType_PeachBattlePass: - if errdata, items = this.warorder.Delivery(session, args.Productid); errdata != nil { + if errdata, items = this.warorder.Delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return } break case pb.DBPayType_PeachRecharge: - if errdata, items = this.modelActivity.delivery(session, args.Productid); errdata != nil { + if errdata, items = this.modelActivity.delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return } break case pb.DBPayType_ActivityFunds: - if errdata, items = this.shopcenter.Delivery(session, args.Productid); errdata != nil { + if errdata, items = this.shopcenter.Delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return } break case pb.DBPayType_PushgiftBag: - if errdata, items = this.pushgiftbag.Delivery(session, args.Productid); errdata != nil { + if errdata, items = this.pushgiftbag.Delivery(session, order.Pid); errdata != nil { reply.Code = errdata.Code return }