client/order.go

@@ -98,24 +98,3 @@ 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
-}

model/order_request.go

@@ -38,13 +38,3 @@ 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"`
-}

model/order_response.go

@@ -1,35 +0,0 @@
-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"`
-	WarehouseStatus string                `json:"warehouseStatus"`
-	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"`
-}

model/warehouse_request.go

@@ -36,11 +36,9 @@ type InsuranceOpts struct {
 
 // OutboundRequestItem ...
 type OutboundRequestItem struct {
-	SupplierSKU string  `json:"supplierSKU"`
+	SupplierSKU string `json:"supplierSKU"`
-	Quantity    int64   `json:"quantity"`
+	Quantity    int64  `json:"quantity"`
-	UnitCode    string  `json:"unitCode"`
+	UnitCode    string `json:"unitCode"`
-	Price       float64 `json:"price"`
-	Name        string  `json:"name"`
 }
 
 // CustomerInfo ...
@@ -65,22 +63,18 @@ type UpdateOutboundRequestLogisticInfoPayload struct {
 	ShippingLabel string `json:"shippingLabel"`
 	TrackingCode  string `json:"trackingCode"`
 	ORCode        string `json:"orCode"`
-	TPLCode       string `json:"tplCode"`
-	OrderID       string `json:"orderId"`
 }
 
 // CancelOutboundRequest ...
 type CancelOutboundRequest struct {
-	ORCode  string `json:"orCode"`
+	ORCode string `json:"orCode"`
-	OrderID string `json:"orderId"`
+	Note   string `json:"note"`
-	Note    string `json:"note"`
 }
 
 // SyncORStatusRequest ...
 type SyncORStatusRequest struct {
 	ORCode    string `json:"orCode"`
 	OrderCode string `json:"orderCode"`
-	OrderID   string `json:"orderId"`
 }
 
 // UpdateSupplierIsClosedRequest ...

subject/order.go

@@ -12,12 +12,10 @@ 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"),
 }

subject/warehouse.go

@@ -14,7 +14,6 @@ var Warehouse = struct {
 	SyncORStatus                  string
 	WebhookTNC                    string
 	WebhookGlobalCare             string
-	WebhookOnPoint                string
 	FindOne                       string
 	FindByCondition               string
 	Distinct                      string
@@ -33,7 +32,6 @@ var Warehouse = struct {
 	SyncORStatus:                  getWarehouseValue("sync_or_status"),
 	WebhookTNC:                    getWarehouseValue("webhook_tnc"),
 	WebhookGlobalCare:             getWarehouseValue("webhook_global_care"),
-	WebhookOnPoint:                getWarehouseValue("webhook_on_point"),
 	FindOne:                       getWarehouseValue("find_one"),
 	FindByCondition:               getWarehouseValue("find_all_by_condition"),
 	Distinct:                      getWarehouseValue("distinct"),