wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 优化

This commit is contained in:
lwl0608 2024-06-14 18:58:03 +08:00
parent ba0a6c25fb
commit 59f495b266
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/mix/controller/vas.go
View File

@ -334,8 +334,6 @@ func DealOneOrder(ctx *gin.Context) {
// 订单退款
func RefundOrder(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*vasproto.RefundOrderReq)
ReplyOk(ctx, nil)
ec, err := service.DefaultService.RefundOrder(ctx, req)
if ec != errcode.ErrCodeVasSrvOk {
logger.Error("RefundOrder fail, req: %v, ec: %v", util.ToJson(req), ec)
@ -346,6 +344,7 @@ func RefundOrder(ctx *gin.Context) {
ReplyErrCodeMsg(ctx, ec)
return
}
ReplyOk(ctx, nil)
}
// 金币订单退款

2
app/mix/controller/zone_vas_api.go
View File

@ -80,7 +80,6 @@ func ZoneRefund(ctx *gin.Context) {
ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam)
return
}
ReplyOk(ctx, nil)
ec, err := service.DefaultService.ZoneRefund(ctx, req)
if ec != errcode.ErrCodeVasSrvOk {
@ -92,6 +91,7 @@ func ZoneRefund(ctx *gin.Context) {
ReplyErrCodeMsg(ctx, ec)
return
}
ReplyOk(ctx, nil)
}
func ZoneMemberList(ctx *gin.Context) {

65
app/mix/service/logic/vas.go
View File

@ -3647,41 +3647,44 @@ func (v *Vas) payRefund(ctx *gin.Context, order *dbstruct.Order) error {
logger.Error("wxpayCli.RefundOne fail, orderId: %v, resp: %v, err: %v", orderId, util.ToJson(resp), err)
return err
}
logger.Info("wxpayCli.RefundOne apply success, orderId: %v", orderId)
// 轮询退款结果，达到同步退款效果
var (
loop = 0
isRefundSuccess = false
)
for range time.Tick(time.Second * 1) {
if loop >= 10 {
break
go func() {
var (
loop = 0
isRefundSuccess = false
)
for range time.Tick(time.Second * 1) {
if loop >= 10 {
break
}
qRefundResp, _err := yeepayCli.QueryRefund(ctx, &yeepaycli.QueryRefundParam{
OutTradeNo: orderId,
RefundRequestId: refundRequestId,
})
if _err != nil {
logger.Error("loop: %v, yeepayCli.QueryRefund fail, orderId: %v, resp: %v, err: %v", loop, orderId, util.ToJson(qRefundResp), _err)
continue
}
if qRefundResp.Code != "OPR00000" {
logger.Error("loop: %v, yeepayCli.QueryRefund fail, invalid code, orderId: %v, resp: %v", loop, orderId, util.ToJson(qRefundResp))
continue
}
if qRefundResp.Status == "SUCCESS" {
logger.Info("loop: %v, yeepayCli.QueryRefund ok, orderId: %v, resp: %v", loop, orderId, util.ToJson(qRefundResp))
isRefundSuccess = true
break
}
loop++
}
qRefundResp, _err := yeepayCli.QueryRefund(ctx, &yeepaycli.QueryRefundParam{
OutTradeNo: orderId,
RefundRequestId: refundRequestId,
})
if _err != nil {
logger.Error("loop: %v, yeepayCli.QueryRefund fail, orderId: %v, resp: %v, err: %v", loop, orderId, util.ToJson(qRefundResp), _err)
continue
if !isRefundSuccess {
err = fmt.Errorf("退款失败，请稍后再试")
logger.Error("wxpayCli.RefundOne fail, orderId: %v", orderId)
return
}
if qRefundResp.Code != "OPR00000" {
logger.Error("loop: %v, yeepayCli.QueryRefund fail, invalid code, orderId: %v, resp: %v", loop, orderId, util.ToJson(qRefundResp))
continue
}
if qRefundResp.Status == "SUCCESS" {
logger.Info("loop: %v, yeepayCli.QueryRefund ok, orderId: %v, resp: %v", loop, orderId, util.ToJson(qRefundResp))
isRefundSuccess = true
break
}
loop++
}
if !isRefundSuccess {
err = fmt.Errorf("退款失败，请稍后再试")
logger.Error("wxpayCli.RefundOne fail, orderId: %v", orderId)
return err
}
logger.Info("wxpayCli.RefundOne success, orderId: %v", orderId)
logger.Info("wxpayCli.RefundOne success, orderId: %v", orderId)
}()
}
return nil
}