diff --git a/pay/pay.go b/pay/pay.go index 715db48..0cfd712 100644 --- a/pay/pay.go +++ b/pay/pay.go @@ -6,18 +6,17 @@ import ( "errors" ) -func JudgePayChannel(mid, paySceneIdentifier string) (model.PayChannel, error) { +func JudgePayChannel(mid, paySceneIdentifier string) (model.PayChannelMaster, error) { var payChannelMaster = model.PayChannelMaster{} - var payChannel = model.PayChannel{} res, err := db.Db.Where("app_id = ?", mid).And("identifier = ?", paySceneIdentifier).Get(&payChannelMaster) if err != nil { - return payChannel, err + return payChannelMaster, err } if !res { - return payChannel, errors.New("查询数据失败") + return payChannelMaster, errors.New("查询数据失败") } if payChannelMaster.ChannelId == 0 { - return payChannel, errors.New("请联系服务商绑定支付渠道") + return payChannelMaster, errors.New("请联系服务商绑定支付渠道") } - return payChannel, nil + return payChannelMaster, nil }