重构代码结构与认证体系,集成异步任务消费者
This commit is contained in:
@@ -12,11 +12,11 @@ import (
|
||||
"platform/web/core"
|
||||
coupon2 "platform/web/domains/coupon"
|
||||
trade2 "platform/web/domains/trade"
|
||||
"platform/web/events"
|
||||
g "platform/web/globals"
|
||||
"platform/web/globals/orm"
|
||||
m "platform/web/models"
|
||||
q "platform/web/queries"
|
||||
"platform/web/tasks"
|
||||
"time"
|
||||
|
||||
"github.com/shopspring/decimal"
|
||||
@@ -240,7 +240,7 @@ func (s *tradeService) CreateTrade(uid int32, now time.Time, data *CreateTradeDa
|
||||
}
|
||||
|
||||
// 提交异步关闭事件
|
||||
_, err = g.Asynq.Enqueue(tasks.NewCancelTrade(tasks.CancelTradeData{
|
||||
_, err = g.Asynq.Enqueue(events.NewCancelTrade(events.CancelTradeData{
|
||||
TradeNo: tradeNo,
|
||||
Method: method,
|
||||
}))
|
||||
@@ -417,7 +417,7 @@ func (s *tradeService) CancelTrade(tradeNo string, method trade2.Method, now tim
|
||||
MchOrderNo: &tradeNo,
|
||||
})
|
||||
if err != nil {
|
||||
slog.Debug(fmt.Sprintf("订单无需关闭:%s", err.Error()))
|
||||
slog.Debug(fmt.Sprintf("订单无需关闭: %s", err.Error()))
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -546,11 +546,11 @@ func (s *tradeService) CheckTrade(data *ModifyTradeData) (*CheckTradeResult, err
|
||||
return nil, core.NewBizErr("订单不存在")
|
||||
}
|
||||
return nil, core.NewServErr(
|
||||
fmt.Sprintf("微信上游接口异常:code=%v,message=%v", apiErr.Code, apiErr.Message),
|
||||
fmt.Sprintf("微信上游接口异常: code=%v,message=%v", apiErr.Code, apiErr.Message),
|
||||
apiErr,
|
||||
)
|
||||
}
|
||||
return nil, core.NewServErr(fmt.Sprintf("微信上游支付接口异常:%s", err.Error()))
|
||||
return nil, core.NewServErr(fmt.Sprintf("微信上游支付接口异常: %s", err.Error()))
|
||||
}
|
||||
|
||||
// 填充返回值
|
||||
|
||||
Reference in New Issue
Block a user