From 73181bc5836149a8c1cc07f0ae7c4af08476b162 Mon Sep 17 00:00:00 2001
From: Sinh <luuvansinh555@gmail.com>
Date: Wed, 21 Sep 2022 17:40:49 +0700
Subject: [PATCH 1/2] add order func

---
 client/order.go         | 21 +++++++++++++++++++++
 model/order_request.go  | 10 ++++++++++
 model/order_response.go | 34 ++++++++++++++++++++++++++++++++++
 subject/order.go        |  2 ++
 4 files changed, 67 insertions(+)
 create mode 100644 model/order_response.go

diff --git a/client/order.go b/client/order.go
index 7d23cee..db325a1 100644
--- a/client/order.go
+++ b/client/order.go
@@ -98,3 +98,24 @@ func (o Order) ORNotUpdateStatus(p model.OrderORsNotUpdateStatus) error {
 	}
 	return nil
 }
+
+// GetSupplierOrders ...
+func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrderList, error) {
+	msg, err := natsio.GetServer().Request(subject.Order.GetSupplierOrders, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var (
+		r struct {
+			Data  model.SupplierOrderList `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 af4989d..ba920f4 100644
--- a/model/order_request.go
+++ b/model/order_request.go
@@ -38,3 +38,13 @@ type OrderUpdateLogisticInfoFailed struct {
 type OrderORsNotUpdateStatus struct {
 	ORCodes []string `json:"orCodes"`
 }
+
+// OrderSupplierQuery ...
+type OrderSupplierQuery struct {
+	Limit        int64    `json:"limit"`
+	Page         int64    `json:"page"`
+	FromDate     string   `json:"fromDate"`
+	ToDate       string   `json:"toDate"`
+	SupplierID   string   `json:"supplierId"`
+	WarehouseIDs []string `json:"warehouseIDs"`
+}
diff --git a/model/order_response.go b/model/order_response.go
new file mode 100644
index 0000000..cbde555
--- /dev/null
+++ b/model/order_response.go
@@ -0,0 +1,34 @@
+package model
+
+import "time"
+
+// SupplierOrderList ...
+type SupplierOrderList struct {
+	List  []SupplierOrder `json:"list"`
+	Total int64           `json:"total" example:"100"`
+	Limit int64           `json:"limit" example:"20"`
+}
+
+// SupplierOrder ...
+type SupplierOrder struct {
+	ID        string                `json:"_id"`
+	Code      string                `json:"code"`
+	CreatedAt time.Time             `json:"createdAt"`
+	Status    string                `json:"status"`
+	Items     []SupplierOrderItem   `json:"items"`
+	Delivery  SupplierOrderDelivery `json:"delivery"`
+}
+
+// SupplierOrderItem ...
+type SupplierOrderItem struct {
+	ID          string `json:"_id" example:"1231"`
+	SupplierSKU string `json:"supplierSku" example:"SUPPLIER_SKU"`
+	Quantity    int64  `json:"quantity" example:"2"`
+}
+
+// SupplierOrderDelivery ...
+type SupplierOrderDelivery struct {
+	Code    string `json:"code" example:"123187287"`
+	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"`
+}
diff --git a/subject/order.go b/subject/order.go
index 1452de3..017f2be 100644
--- a/subject/order.go
+++ b/subject/order.go
@@ -12,10 +12,12 @@ var Order = struct {
 	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"),
 }

From d06719b0e6b4377ebbd82e1cd9da5fd12cafd2f2 Mon Sep 17 00:00:00 2001
From: Sinh <luuvansinh555@gmail.com>
Date: Thu, 22 Sep 2022 09:34:16 +0700
Subject: [PATCH 2/2] define api get supplier orders

---
 model/order_response.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/model/order_response.go b/model/order_response.go
index cbde555..c08f87a 100644
--- a/model/order_response.go
+++ b/model/order_response.go
@@ -11,12 +11,13 @@ type SupplierOrderList struct {
 
 // SupplierOrder ...
 type SupplierOrder struct {
-	ID        string                `json:"_id"`
-	Code      string                `json:"code"`
-	CreatedAt time.Time             `json:"createdAt"`
-	Status    string                `json:"status"`
-	Items     []SupplierOrderItem   `json:"items"`
-	Delivery  SupplierOrderDelivery `json:"delivery"`
+	ID              string                `json:"_id"`
+	Code            string                `json:"code"`
+	CreatedAt       time.Time             `json:"createdAt"`
+	Status          string                `json:"status"`
+	WarehouseStatus string                `json:"warehouseStatus"`
+	Items           []SupplierOrderItem   `json:"items"`
+	Delivery        SupplierOrderDelivery `json:"delivery"`
 }
 
 // SupplierOrderItem ...