liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传支付接口调整

Browse Source
This commit is contained in:
liwei1dao 2023-11-22 14:19:07 +08:00
parent 42d521e01f
commit 18cfb1caae
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comm/imodule.go
View File

@ -31,7 +31,7 @@ type (
} }
//支付发布接口 //支付发布接口
IPayDelivery interface { IPayDelivery interface {
Delivery(session IUserSession, pId string) (errdata *pb.ErrorData, items []*pb.UserAssets) Delivery(session IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets)
} }
) )

8
modules/pay/configure.go
View File

@ -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 ( var (
v interface{} v interface{}
) )
@ -96,7 +96,7 @@ func (this *configureComp) getPayPackageDataByPid(pid string) (result *cfg.GameP
return return
} else { } else {
for _, v := range v.(*cfg.GamePayPackage).GetDataMap() { for _, v := range v.(*cfg.GamePayPackage).GetDataMap() {
if v.Packagetype == pid { if v.Id == pid {
result = v result = v
return 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 ( var (
v interface{} v interface{}
) )
@ -135,7 +135,7 @@ func (this *configureComp) getPayGiftpackDataByPid(pid string) (result *cfg.Game
return return
} else { } else {
for _, v := range v.(*cfg.GamePayGiftpack).GetDataMap() { for _, v := range v.(*cfg.GamePayGiftpack).GetDataMap() {
if v.Packagetype == pid { if v.Id == pid {
result = v result = v
return return
} }

2
modules/pay/modelActivity.go
View File

@ -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 ( var (
info *pb.DBActivityGiftbag info *pb.DBActivityGiftbag
item *pb.ActivityGiftbagItem item *pb.ActivityGiftbagItem

2
modules/pay/modelDaily.go
View File

@ -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 ( var (
info *pb.DBPayDaily info *pb.DBPayDaily
conf *cfg.GamePayPackageData conf *cfg.GamePayPackageData

12
modules/pay/module.go
View File

@ -153,37 +153,37 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
case pb.DBPayType_DiamondShop: case pb.DBPayType_DiamondShop:
break break
case pb.DBPayType_Packs: 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 reply.Code = errdata.Code
return return
} }
break break
case pb.DBPayType_MonthlyPass: 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 reply.Code = errdata.Code
return return
} }
break break
case pb.DBPayType_PeachBattlePass: 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 reply.Code = errdata.Code
return return
} }
break break
case pb.DBPayType_PeachRecharge: 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 reply.Code = errdata.Code
return return
} }
break break
case pb.DBPayType_ActivityFunds: 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 reply.Code = errdata.Code
return return
} }
break break
case pb.DBPayType_PushgiftBag: 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 reply.Code = errdata.Code
return return
} }