增加交易单号
This commit is contained in:
@@ -162,7 +162,7 @@ curl http://localhost:8081/ping
|
|||||||
|
|
||||||
| 方法 | 路径 | 说明 |
|
| 方法 | 路径 | 说明 |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| GET | `/orders` | 订单列表(query:page/page_size/order_no/user_id/status) |
|
| GET | `/orders` | 订单列表(query:page/page_size/order_no/transaction_id/user_id/status) |
|
||||||
| GET | `/orders/:orderNo` | 订单详情 |
|
| GET | `/orders/:orderNo` | 订单详情 |
|
||||||
| GET | `/refunds` | 退款单列表(query:page/page_size/status/order_no) |
|
| GET | `/refunds` | 退款单列表(query:page/page_size/status/order_no) |
|
||||||
| POST | `/refunds/:refundNo/approve` | 审核通过(待处理→退款中) |
|
| POST | `/refunds/:refundNo/approve` | 审核通过(待处理→退款中) |
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ package dto
|
|||||||
type OrderListRequest struct {
|
type OrderListRequest struct {
|
||||||
PageRequest
|
PageRequest
|
||||||
OrderNo string `form:"order_no"` // 订单号(精确)
|
OrderNo string `form:"order_no"` // 订单号(精确)
|
||||||
|
TransactionID string `form:"transaction_id"` // 微信交易号(精确)
|
||||||
UserID int64 `form:"user_id"` // 用户 ID
|
UserID int64 `form:"user_id"` // 用户 ID
|
||||||
Status int8 `form:"status" binding:"omitempty,oneof=1 2 3 4 5"`
|
Status int8 `form:"status" binding:"omitempty,oneof=1 2 3 4 5"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ func NewOrderDao() *OrderDao {
|
|||||||
// OrderListParams 订单分页列表筛选参数。
|
// OrderListParams 订单分页列表筛选参数。
|
||||||
type OrderListParams struct {
|
type OrderListParams struct {
|
||||||
OrderNo string // 订单号(精确)
|
OrderNo string // 订单号(精确)
|
||||||
|
TransactionID string // 微信交易号(精确)
|
||||||
UserID int64 // 用户 ID,0 表示全部
|
UserID int64 // 用户 ID,0 表示全部
|
||||||
Status int8 // 订单状态,0 表示全部
|
Status int8 // 订单状态,0 表示全部
|
||||||
Page int
|
Page int
|
||||||
@@ -38,6 +39,9 @@ func (d *OrderDao) OrderList(ctx context.Context, p OrderListParams) ([]mysqlmod
|
|||||||
if p.OrderNo != "" {
|
if p.OrderNo != "" {
|
||||||
q = q.Where("order_no = ?", p.OrderNo)
|
q = q.Where("order_no = ?", p.OrderNo)
|
||||||
}
|
}
|
||||||
|
if p.TransactionID != "" {
|
||||||
|
q = q.Where("transaction_id = ?", p.TransactionID)
|
||||||
|
}
|
||||||
if p.UserID != 0 {
|
if p.UserID != 0 {
|
||||||
q = q.Where("user_id = ?", p.UserID)
|
q = q.Where("user_id = ?", p.UserID)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ func (s *OrderService) List(ctx context.Context, request *dto.OrderListRequest)
|
|||||||
|
|
||||||
list, total, err := s.orderDao.OrderList(ctx, mysqldao.OrderListParams{
|
list, total, err := s.orderDao.OrderList(ctx, mysqldao.OrderListParams{
|
||||||
OrderNo: strings.TrimSpace(request.OrderNo),
|
OrderNo: strings.TrimSpace(request.OrderNo),
|
||||||
|
TransactionID: strings.TrimSpace(request.TransactionID),
|
||||||
UserID: request.UserID,
|
UserID: request.UserID,
|
||||||
Status: request.Status,
|
Status: request.Status,
|
||||||
Page: page,
|
Page: page,
|
||||||
|
|||||||
Reference in New Issue
Block a user