From fcdc44b94e0a629d3e69b03d8d67f5f4074e5758 Mon Sep 17 00:00:00 2001 From: chy <2463300564@qq.com> Date: Thu, 19 Jun 2025 17:33:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=8E=A5=E5=8F=A3(=E6=96=B0=E5=A2=9E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/merchant/v1/merchant.go | 14 +++++++++----- internal/controller/merchant/merchant_v1_audit.go | 2 +- internal/logic/merchant/merchant.go | 8 ++++++-- internal/model/merchant.go | 4 +++- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/api/merchant/v1/merchant.go b/api/merchant/v1/merchant.go index 8d3ce75..fd43ddc 100644 --- a/api/merchant/v1/merchant.go +++ b/api/merchant/v1/merchant.go @@ -1,6 +1,9 @@ package v1 -import "github.com/gogf/gf/v2/frame/g" +import ( + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gtime" +) type ListReq struct { g.Meta `path:"/merchant" method:"get" tags:"Merchant" summary:"(系统管理员)获取商户列表"` @@ -30,10 +33,11 @@ type UpdateRes struct { type AuditReq struct { g.Meta `path:"/merchant/audit" method:"post" tags:"Merchant" summary:"(系统管理员)商户审核"` - Id int64 `json:"id" v:"required" dc:"商户ID"` - AuditStatus int `json:"auditStatus" v:"required" dc:"审核状态：2=审核通过，3=审核拒绝" ` - AuditRemark string `json:"auditRemark" dc:"审核备注"` - RejectReason string `json:"rejectReason" dc:"拒绝原因"` + Id int64 `json:"id" v:"required" dc:"商户ID"` + AuditStatus int `json:"auditStatus" v:"required" dc:"审核状态：2=审核通过，3=审核拒绝" ` + AuditRemark string `json:"auditRemark" dc:"审核备注"` + RejectReason string `json:"rejectReason" dc:"拒绝原因"` + ExpireAt *gtime.Time `json:"serviceExpire" dc:"商户到期时间"` } type AuditRes struct { } diff --git a/internal/controller/merchant/merchant_v1_audit.go b/internal/controller/merchant/merchant_v1_audit.go index 6fed20b..d3a0b96 100644 --- a/internal/controller/merchant/merchant_v1_audit.go +++ b/internal/controller/merchant/merchant_v1_audit.go @@ -11,7 +11,7 @@ import ( func (c *ControllerV1) Audit(ctx context.Context, req *v1.AuditReq) (res *v1.AuditRes, err error) { adminId := g.RequestFromCtx(ctx).GetCtxVar("id").Int64() - _, err = service.Merchant().Audit(ctx, &model.MerchantAuditIn{Id: req.Id, AuditStatus: req.AuditStatus, AuditRemark: req.AuditRemark, AdminId: adminId, RejectReason: req.RejectReason}) + _, err = service.Merchant().Audit(ctx, &model.MerchantAuditIn{Id: req.Id, AuditStatus: req.AuditStatus, AuditRemark: req.AuditRemark, AdminId: adminId, RejectReason: req.RejectReason, ExpireAt: req.ExpireAt}) if err != nil { return nil, err } diff --git a/internal/logic/merchant/merchant.go b/internal/logic/merchant/merchant.go index 8e5209e..910dd1e 100644 --- a/internal/logic/merchant/merchant.go +++ b/internal/logic/merchant/merchant.go @@ -57,13 +57,17 @@ func (s *sMerchant) Audit(ctx context.Context, in *model.MerchantAuditIn) (out * status = 1 } if err = dao.Merchants.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) { + var time *gtime.Time + if in.ExpireAt != nil { + time = in.ExpireAt.AddDate(1, 0, 0) + } 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(), - ExpireAt: gtime.Now().AddDate(1, 0, 0), // 暂定审核通过后1年 - Status: status, // 暂定审核通过商户即可使用 + ExpireAt: time, // 暂定审核通过后1年 + Status: status, // 暂定审核通过商户即可使用 RejectReason: in.RejectReason, }).OmitEmptyData().Update(); err != nil { diff --git a/internal/model/merchant.go b/internal/model/merchant.go index 787a154..d7ff257 100644 --- a/internal/model/merchant.go +++ b/internal/model/merchant.go @@ -16,7 +16,7 @@ type Merchant struct { Address string `json:"address" orm:"address"` // 商户地址 Status int `json:"status" orm:"status,default:1"` // 状态：1=正常，2=禁用 ExpireAt *gtime.Time `json:"expireAt" orm:"expire_at"` // 服务到期时间 - ApplicationReason int64 `json:"applicationReason" orm:"application_reason"` // 申请理由 + ApplicationReason string `json:"applicationReason" orm:"application_reason"` // 申请理由 CreatedBy int64 `json:"createdBy" orm:"created_by"` // 创建人ID CreatedByType int `json:"createdByType" orm:"created_by_type"` // 创建人类型：1=系统管理员，2=商户注册 AuditStatus int `json:"auditStatus" orm:"audit_status,default:0"` // 审核状态：0=待审核，1=审核通过，2=审核拒绝 @@ -24,6 +24,7 @@ type Merchant struct { AuditAt *gtime.Time `json:"auditAt" orm:"audit_at"` // 审核时间 AuditRemark string `json:"auditRemark" orm:"audit_remark"` // 审核备注 RejectReason string `json:"rejectReason" orm:"reject_reason"` // 拒绝原因 + CreatedAt *gtime.Time `json:"createdAt" orm:"created_at"` } // MerchantCreateIn 创建商户请求 @@ -59,6 +60,7 @@ type MerchantAuditIn struct { AuditStatus int AuditRemark string RejectReason string + ExpireAt *gtime.Time } type MerchantAuditOut struct { }