From 8703d49fe011ddcbe27143757c239cd36203e644 Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Sat, 12 Jul 2025 18:16:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=9A=E6=97=B6=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/member_recharge.go | 19 +++++++++++++++++++
 app/jobs/examples.go                 | 11 ++++++-----
 app/jobs/proxy_job.go                | 12 ++++++++++++
 app/jobs/trx_job_test.go             | 11 +++++++++++
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/admin/service/member_recharge.go b/app/admin/service/member_recharge.go
index 9eadc8d..60eb792 100644
--- a/app/admin/service/member_recharge.go
+++ b/app/admin/service/member_recharge.go
@@ -26,6 +26,25 @@ type MemberRecharge struct {
 	service.Service
 }
 
+func (e MemberRecharge) CleanExpiredOrder() error {
+	expireTime := time.Now().Add(5 * time.Minute)
+	ctx := context.Background()
+
+	err := e.Orm.Transaction(func(tx *gorm.DB) error {
+		if err1 := tx.Model(&models.MemberRecharge{}).Where("expire_time <? and status =1", expireTime).Updates(map[string]interface{}{"status": 6, "updated_at": time.Now()}).Error; err1 != nil {
+			return err1
+		}
+
+		if err1 := receiveaddressmanager.CleanExpiredAmountLocks(ctx, redishelper.DefaultRedis.GetClient()); err1 != nil {
+			return err1
+		}
+
+		return nil
+	})
+
+	return err
+}
+
 // 获取订单状态
 func (e MemberRecharge) GetOrderStatus(req *dto.MemberRechargeGetOrderStatusReq, userId int) (int, error) {
 	var data models.MemberRecharge
diff --git a/app/jobs/examples.go b/app/jobs/examples.go
index c56b5ca..12888b2 100644
--- a/app/jobs/examples.go
+++ b/app/jobs/examples.go
@@ -10,11 +10,12 @@ import (
 // 字典 key 可以配置到 自动任务 调用目标 中；
 func InitJob() {
 	jobList = map[string]JobExec{
-		"ExamplesOne":         ExamplesOne{},
-		"TrxPaymentJob":       TrxPaymentJob{},
-		"CliProxyTrafficsJob": CliProxyJob{},
-		"RenewalJob":          RenewalJob{},
-		"ExpireProxyJob":      ExpireProxyJob{},
+		"ExamplesOne":          ExamplesOne{},
+		"TrxPaymentJob":        TrxPaymentJob{},
+		"CliProxyTrafficsJob":  CliProxyJob{},
+		"RenewalJob":           RenewalJob{},
+		"ExpireProxyJob":       ExpireProxyJob{},
+		"CleanExpiredOrderJob": CleanExpiredOrderJob{},
 		// ...
 	}
 }
diff --git a/app/jobs/proxy_job.go b/app/jobs/proxy_job.go
index 59cd84c..17f0cda 100644
--- a/app/jobs/proxy_job.go
+++ b/app/jobs/proxy_job.go
@@ -26,3 +26,15 @@ func (j ExpireProxyJob) Exec(args interface{}) error {
 
 	return memberRenewalService.ExpireProxy()
 }
+
+type CleanExpiredOrderJob struct{}
+
+// 清理过期订单
+func (t CleanExpiredOrderJob) Exec(arg interface{}) error {
+	// expireTime := time.Now().Add(5 * time.Minute)
+	rechargeLogService := service.MemberRecharge{}
+	rechargeLogService.Orm = GetDb()
+	rechargeLogService.Log = logger.NewHelper(logger.DefaultLogger)
+
+	return rechargeLogService.CleanExpiredOrder()
+}
diff --git a/app/jobs/trx_job_test.go b/app/jobs/trx_job_test.go
index ebfc595..5121425 100644
--- a/app/jobs/trx_job_test.go
+++ b/app/jobs/trx_job_test.go
@@ -67,3 +67,14 @@ func TestExpireJob(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestCleanExpireProxy(t *testing.T) {
+	initSetting()
+
+	job := CleanExpiredOrderJob{}
+
+	err := job.Exec(nil)
+	if err != nil {
+		t.Error(err)
+	}
+}