修改商户审核接口(新增服务到期时间)

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:"(系统管理员)获取商户列表"`
@@ -34,6 +37,7 @@ type AuditReq struct {
 	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 {
 }

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
 	}

internal/logic/merchant/merchant.go

@@ -57,12 +57,16 @@ 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年
+			ExpireAt:     time,   // 暂定审核通过后1年
 			Status:       status, // 暂定审核通过商户即可使用
 			RejectReason: in.RejectReason,
 		}).OmitEmptyData().Update(); err != nil {

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 {
 }