diff --git a/api/controller/OrderMember.go b/api/controller/OrderMember.go index a271ca9..d0962de 100644 --- a/api/controller/OrderMember.go +++ b/api/controller/OrderMember.go @@ -122,9 +122,10 @@ func (b *OrderMember) AddOrderMember(c *gin.Context) { tx.Commit() // 处理返回值 - orderId := fmt.Sprintf("%d", orderMember.OrderId) - - responses.OkWithData(orderId, c) + g := &dto.AddOrderMemberDto{} + g.OrderId = fmt.Sprintf("%d", orderMember.OrderId) + g.OrderNo = orderMember.OrderNo + responses.OkWithData(g, c) } // GetOrderMemberPay 获取会员订单支付数据 diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go index c5eb544..d8f2c61 100644 --- a/api/controller/OrderSingle.go +++ b/api/controller/OrderSingle.go @@ -122,9 +122,10 @@ func (b *OrderSingle) AddOrderSingle(c *gin.Context) { tx.Commit() // 处理返回值 - orderId := fmt.Sprintf("%d", orderSingle.OrderId) - - responses.OkWithData(orderId, c) + g := &dto.AddOrderSingleDto{} + g.OrderId = fmt.Sprintf("%d", orderSingle.OrderId) + g.OrderNo = orderSingle.OrderNo + responses.OkWithData(g, c) } // PutCancelOrderSingle 取消单项订单 diff --git a/api/dto/OrderMember.go b/api/dto/OrderMember.go index c2971d4..d50989b 100644 --- a/api/dto/OrderMember.go +++ b/api/dto/OrderMember.go @@ -64,6 +64,12 @@ type OrderMemberRecentListDto struct { TimeDesc string `json:"time_desc"` // 时间描述 } +// AddOrderMemberDto 创建会员订单 +type AddOrderMemberDto struct { + OrderId string `json:"order_id"` // 主键id + OrderNo string `json:"order_no"` // 系统订单编号 +} + // GetOrderMemberListDto 列表 func GetOrderMemberListDto(m []*model.OrderMember) []*OrderMemberDto { // 处理返回值 diff --git a/api/dto/OrderSingle.go b/api/dto/OrderSingle.go index 114001f..e4104d1 100644 --- a/api/dto/OrderSingle.go +++ b/api/dto/OrderSingle.go @@ -53,6 +53,12 @@ type OrderSinglePayStatusDto struct { ValidDate *model.LocalTime `json:"valid_date"` // 到期时间 } +// AddOrderSingleDto 创建单项订单 +type AddOrderSingleDto struct { + OrderId string `json:"order_id"` // 主键id + OrderNo string `json:"order_no"` // 系统订单编号 +} + // GetOrderSingleListDto 列表 func GetOrderSingleListDto(m []*model.OrderSingle) []*OrderSingleDto { // 处理返回值