From 0b927164c1edbafac6f9a41ba0aad6d9801d2476 Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Wed, 25 Dec 2024 12:31:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/mix/dao/mongo_vas.go          |  2 +-
 app/mix/service/logic/vas_zone.go | 30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/mix/dao/mongo_vas.go b/app/mix/dao/mongo_vas.go
index afc22cc3..11e8fca0 100644
--- a/app/mix/dao/mongo_vas.go
+++ b/app/mix/dao/mongo_vas.go
@@ -380,7 +380,7 @@ func (m *Mongo) GetRefundAudit(ctx *gin.Context) ([]*dbstruct.RefundInfo, error)
 			"$gte": at - 5*60, // >=
 			"$lte": at,        // <=
 		},
-		"refunds_status": dbstruct.RefundsApproved,
+		"refunds_status": dbstruct.RefundsAwaiting,
 	}
 	err := col.Find(ctx, query).All(&list)
 	if errors.Is(err, qmgo.ErrNoSuchDocuments) {
diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go
index 1e34b998..bce82de2 100644
--- a/app/mix/service/logic/vas_zone.go
+++ b/app/mix/service/logic/vas_zone.go
@@ -1141,6 +1141,11 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
 
 	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)
+		err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, dbstruct.RefundsOvertime)
+		if err != nil {
+			logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
+			return err
+		}
 		return fmt.Errorf("审核订单超时，已自动退款")
 	}
 
@@ -1149,12 +1154,6 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
 		return fmt.Errorf("退款订单已审核")
 	}
 
-	err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, req.RefundsStatus)
-	if err != nil {
-		logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
-		return err
-	}
-
 	// 退款
 	err = v.RefundOrder(ctx, &vasproto.RefundOrderReq{
 		OrderId:  info.OrderId,
@@ -1170,6 +1169,12 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
 		return err
 	}
 
+	err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, req.RefundsStatus)
+	if err != nil {
+		logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
+		return err
+	}
+
 	return nil
 }
 
@@ -1186,13 +1191,6 @@ func (v *Vas) UserRefundAuditTimes(ctx *gin.Context) error {
 		ids = append(ids, v.AuditId)
 	}
 
-	// 订单自动退款 mongodb 数据修改
-	err = v.store.SetRefundAudit(ctx, ids)
-	if err != nil {
-		logger.Error("UserRefundAuditTimes SetRefundAudit fail ", err)
-		return err
-	}
-
 	for _, refundInfo := range list {
 		req := &vasproto.ZoneRefundReq{
 			Zid:          refundInfo.Zid,
@@ -1210,6 +1208,12 @@ func (v *Vas) UserRefundAuditTimes(ctx *gin.Context) error {
 			continue
 		}
 	}
+	// 订单自动退款 mongodb 数据修改
+	err = v.store.SetRefundAudit(ctx, ids)
+	if err != nil {
+		logger.Error("UserRefundAuditTimes SetRefundAudit fail ", err)
+		return err
+	}
 	logger.Info("UserRefundAuditTimes Refund order streamer review timeout, list: %v, ", util.ToJson(list))
 	return nil
 }