From 82d8944e7aaba79dafb3a70855b51018f9c61db4 Mon Sep 17 00:00:00 2001
From: denghui <1016848185@qq.com>
Date: Wed, 11 Jun 2025 10:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E6=88=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/merchant/merchant.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/logic/merchant/merchant.go b/internal/logic/merchant/merchant.go
index ad13d9e..8e5209e 100644
--- a/internal/logic/merchant/merchant.go
+++ b/internal/logic/merchant/merchant.go
@@ -52,13 +52,18 @@ func (s *sMerchant) Audit(ctx context.Context, in *model.MerchantAuditIn) (out *
 	if merchant[dao.Merchants.Columns().AuditStatus].Int() != 1 {
 		return nil, ecode.Params.Sub("商户已审核")
 	}
+	status := 2
+	if in.AuditStatus == 2 {
+		status = 1
+	}
 	if err = dao.Merchants.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		if _, err = tx.Model(dao.Merchants.Table()).WherePri(in.Id).Data(do.Merchants{
 			AuditBy:      in.AdminId,
 			AuditRemark:  in.AuditRemark,
 			AuditStatus:  in.AuditStatus,
 			AuditAt:      gtime.Now(),
-			Status:       in.AuditStatus, // 暂定审核通过商户即可使用
+			ExpireAt:     gtime.Now().AddDate(1, 0, 0), // 暂定审核通过后1年
+			Status:       status,                       // 暂定审核通过商户即可使用
 			RejectReason: in.RejectReason,
 		}).OmitEmptyData().Update(); err != nil {