From 3a4f4aacd2ef850eacbe50276c6496d2192bf99d Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Tue, 4 Jun 2024 17:50:03 +0800
Subject: [PATCH] fix

---
 app/mix/service/logic/vas.go  | 6 +++---
 app/mix/service/vasservice.go | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/mix/service/logic/vas.go b/app/mix/service/logic/vas.go
index abad884e..dc2835bb 100644
--- a/app/mix/service/logic/vas.go
+++ b/app/mix/service/logic/vas.go
@@ -1355,7 +1355,7 @@ func (v *Vas) GetUserWechatUnlock(ctx *gin.Context, mid, uid int64) (uu *dbstruc
 }
 
 // 【支付】回调
-func (v *Vas) PayCallback(ctx *gin.Context, p *vasproto.PayCallbackParamIn) (err error) {
+func (v *Vas) PayCallback(ctx *gin.Context, p *vasproto.PayCallbackParamIn) error {
 	var (
 		orderId     = p.OrderId
 		outOrderId  = p.OutOrderId
@@ -1580,9 +1580,9 @@ func (v *Vas) PayCallback(ctx *gin.Context, p *vasproto.PayCallbackParamIn) (err
 	_err := v.UnlockZoneIronfanshipReachConsume(ctx, tx, order.GetMid(), order.GetZid(), order.GetUid())
 	if _err != nil {
 		logger.Error("UnlockZoneIronfanshipReachConsume fail, order: %v, err: %v", util.ToJson(order), _err)
-		return err
+		return nil
 	}
-	return err
+	return nil
 }
 
 func (v *Vas) GetCoinOrderById(ctx *gin.Context, id string) (*dbstruct.CoinOrder, error) {
diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go
index 63eaa94e..0fe275c9 100644
--- a/app/mix/service/vasservice.go
+++ b/app/mix/service/vasservice.go
@@ -498,9 +498,8 @@ func (s *Service) H5DirectUnlockWechat(ctx *gin.Context, req *vasproto.H5DirectU
 }
 
 // 支付回调
-func (s *Service) PayCallback(ctx *gin.Context, req *vasproto.PayCallbackParamIn) (data *vasproto.H5DirectUnlockWechatData, ec errcode.ErrCode) {
-	_ = _DefaultVas.PayCallback(ctx, req)
-	return
+func (s *Service) PayCallback(ctx *gin.Context, req *vasproto.PayCallbackParamIn) error {
+	return _DefaultVas.PayCallback(ctx, req)
 }
 
 // 提现页面