修复重构后逻辑问题
This commit is contained in:
@@ -261,7 +261,7 @@ func StatisticResourceFree(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
// 统计套餐剩余数量
|
||||
resources, err := q.Resource.Debug().
|
||||
resources, err := q.Resource.
|
||||
Preload(
|
||||
q.Resource.Short,
|
||||
q.Resource.Long,
|
||||
@@ -383,7 +383,7 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
var data = new(StatisticResourceUsageResp)
|
||||
err = q.LogsUserUsage.Debug().
|
||||
err = q.LogsUserUsage.
|
||||
Select(
|
||||
q.LogsUserUsage.Count_.Sum().As("count"),
|
||||
field.NewUnsafeFieldRaw("date_trunc('day', time)").As("date"),
|
||||
|
||||
@@ -81,10 +81,7 @@ func TradeComplete(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
// 检查订单状态
|
||||
err = s.Trade.CompleteTrade(&s.ModifyTradeData{
|
||||
TradeNo: req.TradeNo,
|
||||
Method: req.Method,
|
||||
})
|
||||
err = s.Trade.CompleteTrade(&req.ModifyTradeData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -110,7 +107,7 @@ func TradeCancel(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
// 取消交易
|
||||
err = s.Trade.CancelTrade(req.TradeNo, req.Method, time.Now())
|
||||
err = s.Trade.CancelTrade(&req.ModifyTradeData, time.Now())
|
||||
if err != nil {
|
||||
slog.Error("取消交易失败", "trade_no", req.TradeNo, "error", err)
|
||||
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "取消交易失败"})
|
||||
|
||||
Reference in New Issue
Block a user