From 3fc0a1c77ff792c5c0e047d34411bb0ddff10941 Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Tue, 24 Dec 2024 11:18:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/mix/dao/mongo_vas.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/mix/dao/mongo_vas.go b/app/mix/dao/mongo_vas.go index 457e4904..6242660f 100644 --- a/app/mix/dao/mongo_vas.go +++ b/app/mix/dao/mongo_vas.go @@ -379,6 +379,7 @@ func (m *Mongo) GetRefundAudit(ctx *gin.Context) ([]*dbstruct.RefundInfo, error) "$gte": at - 5*60, // >= "$lte": at, // <= }, + "refunds_status": dbstruct.RefundsApproved, } err := col.Find(ctx, query).All(&list) if errors.Is(err, qmgo.ErrNoSuchDocuments) { From 105f77e9e891c3d3e20d9c78cccc7f9b482db5a4 Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Tue, 24 Dec 2024 16:41:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/mix/service/logic/vas_zone.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go index f5b33d8b..31bd7751 100644 --- a/app/mix/service/logic/vas_zone.go +++ b/app/mix/service/logic/vas_zone.go @@ -1125,7 +1125,7 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq info, err := v.store.GetZoneRefundInfo(ctx, req.AuditId) if err != nil { - logger.Error("ZoneRefundAudit GetZoneRefundInfo fail, mid: %v, audit_id: %v, err: %v", req.Mid, req.AuditId, err) + logger.Warn("ZoneRefundAudit GetZoneRefundInfo fail, mid: %v, audit_id: %v, err: %v", req.Mid, req.AuditId, err) return err } @@ -1135,12 +1135,17 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq } if info.StreamerMid != req.Mid { - logger.Error("ZoneRefundAudit, Not personally audited the order, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId) + logger.Warn("ZoneRefundAudit, Not personally audited the order, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId) return fmt.Errorf("非本人审核订单") } + if time.Now().Unix()-info.Ct > 24*3600 { + logger.Warn("ZoneRefundAudit, Order review timeout, automatic refund, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId) + return fmt.Errorf("审核订单超时，已自动退款") + } + if info.RefundsStatus == dbstruct.RefundsApproved || info.RefundsStatus == dbstruct.RefundsRejected || info.RefundsStatus == dbstruct.RefundsOvertime { - logger.Error("ZoneRefundAudit, refund has been approved, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId) + logger.Warn("ZoneRefundAudit, refund has been approved, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId) return fmt.Errorf("退款订单已审核") }