diff --git a/app/main/api/etc/main.yaml b/app/main/api/etc/main.yaml index a94c7b4..496f3df 100644 --- a/app/main/api/etc/main.yaml +++ b/app/main/api/etc/main.yaml @@ -88,4 +88,5 @@ Tianyuanapi: BaseURL: "https://api.tianyuanapi.com" Timeout: 60 Authorization: - FileBaseURL: "https://www.tianyuandb.com/api/v1/auth-docs" # 授权书文件访问基础URL \ No newline at end of file + FileBaseURL: "https://www.tianyuandb.com/api/v1/auth-docs" # 授权书文件访问基础URL +extension_time: 10 # 佣金解冻延迟时间,单位:小时 \ No newline at end of file diff --git a/app/main/api/internal/config/config.go b/app/main/api/internal/config/config.go index eb83a80..11ae3e8 100644 --- a/app/main/api/internal/config/config.go +++ b/app/main/api/internal/config/config.go @@ -7,16 +7,16 @@ import ( type Config struct { rest.RestConf - DataSource string - CacheRedis cache.CacheConf - JwtAuth JwtAuth // JWT 鉴权相关配置 - VerifyCode VerifyCode - Encrypt Encrypt - Alipay AlipayConfig - Wxpay WxpayConfig - Applepay ApplepayConfig - Ali AliConfig - Tianyuanapi TianyuanapiConfig + DataSource string + CacheRedis cache.CacheConf + JwtAuth JwtAuth // JWT 鉴权相关配置 + VerifyCode VerifyCode + Encrypt Encrypt + Alipay AlipayConfig + Wxpay WxpayConfig + Applepay ApplepayConfig + Ali AliConfig + Tianyuanapi TianyuanapiConfig SystemConfig SystemConfig WechatH5 WechatH5Config Authorization AuthorizationConfig // 授权书配置 @@ -25,6 +25,7 @@ type Config struct { AdminConfig AdminConfig AdminPromotion AdminPromotion TaxConfig TaxConfig + ExtensionTime int64 } // JwtAuth 用于 JWT 鉴权配置 @@ -98,8 +99,8 @@ type WechatH5Config struct { AppSecret string } type WechatMiniConfig struct { - AppID string - AppSecret string + AppID string + AppSecret string } type QueryConfig struct { ShareLinkExpire int64 @@ -126,4 +127,4 @@ type TianyuanapiConfig struct { type AuthorizationConfig struct { FileBaseURL string // 授权书文件访问基础URL -} \ No newline at end of file +} diff --git a/app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go b/app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go index 485cb18..e51fb59 100644 --- a/app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go +++ b/app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go @@ -32,8 +32,6 @@ func (l *AdminUpdateAgentCommissionStatusLogic) AdminUpdateAgentCommissionStatus if req.Status != 0 && req.Status != 1 && req.Status != 2 { return nil, xerr.NewErrMsg("无效的状态值,状态必须为0(已结算)、1(冻结中)或2(已取消)") } - - // 查询佣金记录 commission, err := l.svcCtx.AgentCommissionModel.FindOne(l.ctx, req.Id) if err != nil { if errors.Is(err, model.ErrNotFound) { diff --git a/app/main/api/internal/service/asynqService.go b/app/main/api/internal/service/asynqService.go index 4d13ecd..14f8b02 100644 --- a/app/main/api/internal/service/asynqService.go +++ b/app/main/api/internal/service/asynqService.go @@ -74,8 +74,8 @@ func (s *AsynqService) SendUnfreezeCommissionTask(commissionID int64) error { } options := []asynq.Option{ - asynq.ProcessIn(10 * time.Hour), // 10小时后执行 - asynq.MaxRetry(5), // 设置最大重试次数 + asynq.ProcessIn(time.Duration(s.config.ExtensionTime) * time.Hour), // 10小时后执行 + asynq.MaxRetry(5), // 设置最大重试次数 } task := asynq.NewTask(types.MsgUnfreezeCommission, payloadBytes, options...)