From 041dd4361602d147208ef099b242a93cedd90e45 Mon Sep 17 00:00:00 2001 From: Sinh Date: Mon, 27 Mar 2023 15:10:21 +0700 Subject: [PATCH 1/3] update order client --- client/order.go | 19 +++++++++++++++++++ model/order_request.go | 4 ++++ model/order_response.go | 6 ++++++ subject/order.go | 26 ++++++++++++++------------ 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/client/order.go b/client/order.go index a6ab736..f701bd3 100644 --- a/client/order.go +++ b/client/order.go @@ -119,3 +119,22 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd } 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 +} diff --git a/model/order_request.go b/model/order_request.go index bd1fa73..ae70cd8 100644 --- a/model/order_request.go +++ b/model/order_request.go @@ -49,3 +49,7 @@ type OrderSupplierQuery struct { SupplierID string `json:"supplierId"` WarehouseIDs []string `json:"warehouseIDs"` } + +type OrderGetTotalWarningPayload struct { + UserID string `json:"userId"` +} diff --git a/model/order_response.go b/model/order_response.go index c08f87a..d2791c6 100644 --- a/model/order_response.go +++ b/model/order_response.go @@ -33,3 +33,9 @@ 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"` TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"` } + +// OrderGetTotalWarningRes ... +type OrderGetTotalWarningRes struct { + UserID string `json:"userId"` + TotalWarningOrders int64 `json:"totalWarningOrders"` +} diff --git a/subject/order.go b/subject/order.go index 017f2be..ad7c786 100644 --- a/subject/order.go +++ b/subject/order.go @@ -7,17 +7,19 @@ func getOrderValue(val string) string { } var Order = struct { - UpdateORStatus string - CancelDelivery string - ChangeDeliveryStatus string - UpdateLogisticInfoFailed string - ORNotUpdateStatus string - GetSupplierOrders string + UpdateORStatus string + GetUserTotalWarningOrders string + CancelDelivery string + ChangeDeliveryStatus string + UpdateLogisticInfoFailed string + ORNotUpdateStatus string + GetSupplierOrders string }{ - UpdateORStatus: getOrderValue("update_outbound_request_status"), - CancelDelivery: getOrderValue("cancel_delivery"), - ChangeDeliveryStatus: getOrderValue("change_delivery_status"), - UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"), - ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"), - GetSupplierOrders: getOrderValue("get_supplier_orders"), + UpdateORStatus: getOrderValue("update_outbound_request_status"), + GetUserTotalWarningOrders: getOrderValue("get_user_total_warning_orders"), + CancelDelivery: getOrderValue("cancel_delivery"), + ChangeDeliveryStatus: getOrderValue("change_delivery_status"), + UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"), + ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"), + GetSupplierOrders: getOrderValue("get_supplier_orders"), } From a432e7fd44f2c316a8e1c26ab9027ed39cbe1002 Mon Sep 17 00:00:00 2001 From: Sinh Date: Mon, 27 Mar 2023 15:44:39 +0700 Subject: [PATCH 2/3] update socket client --- client/socket.go | 6 ++++++ subject/socket.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/client/socket.go b/client/socket.go index 6c0a125..5ea589f 100644 --- a/client/socket.go +++ b/client/socket.go @@ -19,3 +19,9 @@ func (s Socket) EmitSocketEventDataReward(p model.PayloadEmitSocketEvent) error _, err := natsio.GetServer().Request(subject.Socket.EmitEventReward, toBytes(p)) return err } + +// EmitEventToUser ... +func (s Socket) EmitEventToUser(p model.PayloadEmitSocketEvent) error { + _, err := natsio.GetServer().Request(subject.Socket.EmitEventToUser, toBytes(p)) + return err +} diff --git a/subject/socket.go b/subject/socket.go index dae77c1..7a51789 100644 --- a/subject/socket.go +++ b/subject/socket.go @@ -9,6 +9,8 @@ func getSocketValue(val string) string { // Socket ... var Socket = struct { EmitEventReward string + EmitEventToUser string }{ EmitEventReward: getSocketValue("emit_event_reward"), + EmitEventToUser: "send_message_to_socket", } From 1579e563ac3ea2d1affcd2c991d7ec509a7e792d Mon Sep 17 00:00:00 2001 From: Sinh Date: Fri, 31 Mar 2023 14:56:34 +0700 Subject: [PATCH 3/3] update nats order response --- model/order_response.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/order_response.go b/model/order_response.go index d2791c6..df5e34a 100644 --- a/model/order_response.go +++ b/model/order_response.go @@ -36,6 +36,7 @@ type SupplierOrderDelivery struct { // OrderGetTotalWarningRes ... type OrderGetTotalWarningRes struct { - UserID string `json:"userId"` - TotalWarningOrders int64 `json:"totalWarningOrders"` + UserID string `json:"userId"` + TotalWarningOrder int64 `json:"totalWarningOrder"` + Action ActionType `json:"action"` }