team/qnc-server-v3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: team:787f7a303fd3a4f30bf4d975fd716e09e296842b
Branches Tags
team:main
...
compare: team:98e0c570676cd4534439a1be8a128b3e608d61fa
Branches Tags
team:main

2 Commits
787f7a303f ... 98e0c57067

Author SHA1 Message Date
Mrx
98e0c57067 Merge branch 'main' of http://1.117.67.95:3000/team/qnc-server-v3 2026-02-11 16:32:10 +08:00
Mrx
7e0e027013 f 2026-02-11 16:32:04 +08:00
3 changed files with 4 additions and 1 deletions
Expand all files Collapse all files

1
app/main/api/desc/admin/order.api
View File

@@ -79,6 +79,7 @@ type (
CreateTime string `json:"create_time"` // 创建时间
PayTime string `json:"pay_time"` // 支付时间
RefundTime string `json:"refund_time"` // 退款时间
UpdateTime string `json:"update_time"` // 更新时间
IsAgentOrder bool `json:"is_agent_order"` // 是否是代理订单
AgentProcessStatus string `json:"agent_process_status"` // 代理事务处理状态：not_agent-非代理订单，success-处理成功，failed-处理失败，pending-待处理
}

3
app/main/api/internal/logic/admin_order/admingetorderlistlogic.go
View File

@@ -86,7 +86,7 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
return nil
}, func() error {
var err error
orders, err = l.svcCtx.OrderModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "id DESC")
orders, err = l.svcCtx.OrderModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "update_time DESC")
if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetOrderList, 查询订单列表失败 err: %v", err)
}
@@ -264,6 +264,7 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
Status: order.Status,
CreateTime: order.CreateTime.Format("2006-01-02 15:04:05"),
QueryState: queryStateMap[order.Id],
UpdateTime: order.UpdateTime.Format("2006-01-02 15:04:05"),
}
if order.PayTime.Valid {
item.PayTime = order.PayTime.Time.Format("2006-01-02 15:04:05")

1
app/main/api/internal/types/types.go
View File

@@ -1766,6 +1766,7 @@ type OrderListItem struct {
CreateTime string `json:"create_time"` // 创建时间
PayTime string `json:"pay_time"` // 支付时间
RefundTime string `json:"refund_time"` // 退款时间
UpdateTime string `json:"update_time"` // 更新时间
IsAgentOrder bool `json:"is_agent_order"` // 是否是代理订单
AgentProcessStatus string `json:"agent_process_status"` // 代理事务处理状态：not_agent-非代理订单，success-处理成功，failed-处理失败，pending-待处理
}