From 821c2063c9f1b7112e0f918518d790ee5d24417a Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Thu, 28 Sep 2023 18:04:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/order/order.go         |  2 +-
 service/repositories/order.go | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/server/order/order.go b/server/order/order.go
index a5fbba21..076d2854 100644
--- a/server/order/order.go
+++ b/server/order/order.go
@@ -34,7 +34,7 @@ func main() {
 	ctx := svc.NewServiceContext(c)
 	handler.RegisterHandlers(server, ctx)
 
-	go ctx.Repositories.NewOrder.CloseList(context.Background(), &repositories.CloseListReq{})
+	go ctx.Repositories.NewOrder.CloseList(context.Background(), &repositories.CloseListReq{Type: 1})
 
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
diff --git a/service/repositories/order.go b/service/repositories/order.go
index 7827c381..a4b785e1 100644
--- a/service/repositories/order.go
+++ b/service/repositories/order.go
@@ -217,16 +217,18 @@ func (d *defaultOrder) CloseList(ctx context.Context, in *CloseListReq) (res *Cl
 		} else {
 			dtime = time.Now().Add(time.Second * time.Duration(math.Abs(float64(dd))))
 		}
-		// 延时任务
-		d.DelayQueue.AddTask(dtime, constants.QUEUE_NAME_ORDER, func(args ...interface{}) {
-			ctx := context.Background()
-			orderSn := args[0].(string)
-			logc.Infof(ctx, "order close, orderSn: %s", orderSn)
-			d.Close(ctx, &CloseReq{
-				OrderSn: orderSn,
-				Type:    1,
-			})
-		}, []interface{}{*orderInfo.OrderSn})
+		if in.Type == 1 {
+			// 延时任务
+			d.DelayQueue.AddTask(dtime, constants.QUEUE_NAME_ORDER, func(args ...interface{}) {
+				ctx := context.Background()
+				orderSn := args[0].(string)
+				logc.Infof(ctx, "order close, orderSn: %s", orderSn)
+				d.Close(ctx, &CloseReq{
+					OrderSn: orderSn,
+					Type:    1,
+				})
+			}, []interface{}{*orderInfo.OrderSn})
+		}
 	}
 	return nil, nil
 }