|
@@ -16,9 +16,9 @@ type Order struct {
|
|
|
ServiceTime time.Time `json:"service_time"`
|
|
ServiceTime time.Time `json:"service_time"`
|
|
|
Duration int `json:"duration"`
|
|
Duration int `json:"duration"`
|
|
|
Address string `json:"address"`
|
|
Address string `json:"address"`
|
|
|
- ProviderID *string `json:"provider_id"`
|
|
|
|
|
- CreatedAt time.Time `json:"created_at"`
|
|
|
|
|
- UpdatedAt time.Time `json:"updated_at"`
|
|
|
|
|
|
|
+ ProviderID *string `json:"provider_id"`
|
|
|
|
|
+ CreatedAt time.Time `json:"created_at"`
|
|
|
|
|
+ UpdatedAt time.Time `json:"updated_at"`
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
type CreateOrderRequest struct {
|
|
type CreateOrderRequest struct {
|
|
@@ -47,10 +47,11 @@ func (e *AppError) Error() string {
|
|
|
|
|
|
|
|
// 预定义错误
|
|
// 预定义错误
|
|
|
var (
|
|
var (
|
|
|
- ErrNotFound = NewAppError("not_found", "订单不存在", 404)
|
|
|
|
|
- ErrConflict = NewAppError("conflict", "订单已被其他服务者接单", 409)
|
|
|
|
|
- ErrInvalidState = func(op string) *AppError {
|
|
|
|
|
- return NewAppError("invalid_state", "订单已取消,无法" + op, 400)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ ErrNotFound = NewAppError("not_found", "订单不存在", 404)
|
|
|
|
|
+ ErrConflict = NewAppError("already_accepted", "订单已被其他服务者接单", 409)
|
|
|
ErrStatusConflict = NewAppError("conflict", "订单状态已变更,请重试", 409)
|
|
ErrStatusConflict = NewAppError("conflict", "订单状态已变更,请重试", 409)
|
|
|
)
|
|
)
|
|
|
|
|
+
|
|
|
|
|
+func ErrInvalidState(op string) *AppError {
|
|
|
|
|
+ return NewAppError("invalid_state", "订单已取消,无法"+op, 400)
|
|
|
|
|
+}
|