From 3ac4248f26159182f0130496233b791d0f29a0d0 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Tue, 27 Aug 2024 17:10:20 +0800 Subject: [PATCH] merge --- app/mix/controller/init.go | 2 +- app/mix/controller/vas_op.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index b9be709b..b07b5b40 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -345,7 +345,7 @@ func Init(r *gin.Engine) { opVasPayGroup.POST("zone_refund_list", middleware.JSONParamValidator(zoneproto.OpZoneRefundListParam{}), OpZoneRefundList) opVasPayGroup.POST("manual_unlock_wechat", middleware.JSONParamValidator(zoneproto.OpManualUnlockWechatParam{}), OpManualUnlockWechat) opVasPayGroup.POST("rollback_zone_exit_status", middleware.JSONParamValidator(zoneproto.OpRollbackZoneExitStatusParam{}), OpRollbackZoneAdmissionExitStatus) - opVasPayGroup.POST("rollback_zone_refund_status", middleware.JSONParamValidator(zoneproto.OpRollbackZoneRefundStatusParam{}), OpRollbackZoneRefundExitStatus) + opVasPayGroup.POST("rollback_zone_refund_status", middleware.JSONParamValidator(zoneproto.OpRollbackZoneRefundStatusParam{}), OpRollbackZoneRefundStatus) // 慧用工 extHvyogoGroup := r.Group("/ext/hvyogo") diff --git a/app/mix/controller/vas_op.go b/app/mix/controller/vas_op.go index 098f37a8..c304ff58 100644 --- a/app/mix/controller/vas_op.go +++ b/app/mix/controller/vas_op.go @@ -91,7 +91,7 @@ func OpRollbackZoneAdmissionExitStatus(ctx *gin.Context) { ReplyOk(ctx, nil) } -func OpRollbackZoneRefundExitStatus(ctx *gin.Context) { +func OpRollbackZoneRefundStatus(ctx *gin.Context) { req := ctx.MustGet("client_req").(*zoneproto.OpRollbackZoneRefundStatusParam) ec, err := service.DefaultService.OpRollbackZoneRefundStatus(ctx, req) if ec != errcode.ErrCodeVasSrvOk {