Compare commits
No commits in common. "898ee7822f9a5ffb6f72c372d6f75aa3e8a36193" and "1ca2e5720e869bec52f003f3a606a08efe7ffd12" have entirely different histories.
898ee7822f
...
1ca2e5720e
|
@ -119,22 +119,3 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
|
||||||
}
|
}
|
||||||
return &r.Data, nil
|
return &r.Data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserTotalWarningOrder ...
|
|
||||||
func (o Order) GetUserTotalWarningOrder(p model.OrderGetTotalWarningPayload) (*model.OrderGetTotalWarningRes, error) {
|
|
||||||
msg, err := natsio.GetServer().Request(subject.Order.GetUserTotalWarningOrders, toBytes(p))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var r struct {
|
|
||||||
Data model.OrderGetTotalWarningRes `json:"data"`
|
|
||||||
Error string `json:"error"`
|
|
||||||
}
|
|
||||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if r.Error != "" {
|
|
||||||
return nil, errors.New(r.Error)
|
|
||||||
}
|
|
||||||
return &r.Data, nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -19,9 +19,3 @@ func (s Socket) EmitSocketEventDataReward(p model.PayloadEmitSocketEvent) error
|
||||||
_, err := natsio.GetServer().Request(subject.Socket.EmitEventReward, toBytes(p))
|
_, err := natsio.GetServer().Request(subject.Socket.EmitEventReward, toBytes(p))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// EmitEventToUser ...
|
|
||||||
func (s Socket) EmitEventToUser(p model.PayloadEmitSocketEvent) error {
|
|
||||||
_, err := natsio.GetServer().Request(subject.Socket.EmitEventToUser, toBytes(p))
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
|
@ -49,7 +49,3 @@ type OrderSupplierQuery struct {
|
||||||
SupplierID string `json:"supplierId"`
|
SupplierID string `json:"supplierId"`
|
||||||
WarehouseIDs []string `json:"warehouseIDs"`
|
WarehouseIDs []string `json:"warehouseIDs"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type OrderGetTotalWarningPayload struct {
|
|
||||||
UserID string `json:"userId"`
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,10 +33,3 @@ type SupplierOrderDelivery struct {
|
||||||
Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
|
Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
|
||||||
TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
|
TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// OrderGetTotalWarningRes ...
|
|
||||||
type OrderGetTotalWarningRes struct {
|
|
||||||
UserID string `json:"userId"`
|
|
||||||
TotalWarningOrder int64 `json:"totalWarningOrder"`
|
|
||||||
Action ActionType `json:"action"`
|
|
||||||
}
|
|
||||||
|
|
|
@ -7,19 +7,17 @@ func getOrderValue(val string) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
var Order = struct {
|
var Order = struct {
|
||||||
UpdateORStatus string
|
UpdateORStatus string
|
||||||
GetUserTotalWarningOrders string
|
CancelDelivery string
|
||||||
CancelDelivery string
|
ChangeDeliveryStatus string
|
||||||
ChangeDeliveryStatus string
|
UpdateLogisticInfoFailed string
|
||||||
UpdateLogisticInfoFailed string
|
ORNotUpdateStatus string
|
||||||
ORNotUpdateStatus string
|
GetSupplierOrders string
|
||||||
GetSupplierOrders string
|
|
||||||
}{
|
}{
|
||||||
UpdateORStatus: getOrderValue("update_outbound_request_status"),
|
UpdateORStatus: getOrderValue("update_outbound_request_status"),
|
||||||
GetUserTotalWarningOrders: getOrderValue("get_user_total_warning_orders"),
|
CancelDelivery: getOrderValue("cancel_delivery"),
|
||||||
CancelDelivery: getOrderValue("cancel_delivery"),
|
ChangeDeliveryStatus: getOrderValue("change_delivery_status"),
|
||||||
ChangeDeliveryStatus: getOrderValue("change_delivery_status"),
|
UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
|
||||||
UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
|
ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"),
|
||||||
ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"),
|
GetSupplierOrders: getOrderValue("get_supplier_orders"),
|
||||||
GetSupplierOrders: getOrderValue("get_supplier_orders"),
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,8 +9,6 @@ func getSocketValue(val string) string {
|
||||||
// Socket ...
|
// Socket ...
|
||||||
var Socket = struct {
|
var Socket = struct {
|
||||||
EmitEventReward string
|
EmitEventReward string
|
||||||
EmitEventToUser string
|
|
||||||
}{
|
}{
|
||||||
EmitEventReward: getSocketValue("emit_event_reward"),
|
EmitEventReward: getSocketValue("emit_event_reward"),
|
||||||
EmitEventToUser: "send_message_to_socket",
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue