diff --git a/client/supplier.go b/client/supplier.go index 02bf82d..0a82bac 100644 --- a/client/supplier.go +++ b/client/supplier.go @@ -274,3 +274,23 @@ func (s Supplier) DeleteCashflow(p model.SupplierDeleteCashflowReq) error { } return nil } + +// CheckTokenSupplier ... +func (s Supplier) CheckTokenSupplier(p model.CheckTokenSupplierPayload) (*model.ResponseSupplierInfo, error) { + msg, err := natsio.GetServer().Request(subject.Supplier.CheckTokenSupplier, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Error string `json:"error"` + Data *model.ResponseSupplierInfo `json:"data"` + } + 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/client/warehouse.go b/client/warehouse.go index 664df43..fb391ca 100644 --- a/client/warehouse.go +++ b/client/warehouse.go @@ -182,66 +182,3 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu } return nil } - -// CreateSupplierHoliday ... -func (w Warehouse) CreateSupplierHoliday(p model.SupplierHolidayCreatePayload) error { - msg, err := natsio.GetServer().Request(subject.Warehouse.CreateSupplierHoliday, toBytes(p)) - if err != nil { - return err - } - - var r struct { - Error string `json:"error"` - } - - if err = json.Unmarshal(msg.Data, &r); err != nil { - return fmt.Errorf("nats: create_supplier_holiday %v", err) - } - if r.Error != "" { - return errors.New(r.Error) - } - return nil -} - -// UpdateSupplierHoliday ... -func (w Warehouse) UpdateSupplierHoliday(p model.SupplierHolidayUpdatePayload) error { - msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateSupplierHoliday, toBytes(p)) - if err != nil { - return err - } - - var r struct { - Error string `json:"error"` - } - - if err = json.Unmarshal(msg.Data, &r); err != nil { - return fmt.Errorf("nats: create_supplier_holiday %v", err) - } - if r.Error != "" { - return errors.New(r.Error) - } - return nil -} - -// GetSupplierHoliday ... -func (w Warehouse) GetSupplierHoliday(p model.GetSupplierHolidayRequest) (*model.ResponseSupplierHoliday, error) { - msg, err := natsio.GetServer().Request(subject.Warehouse.GetSupplierHoliday, toBytes(p)) - if err != nil { - return nil, err - } - - var r struct { - Data *model.ResponseSupplierHoliday `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/supplier_request.go b/model/supplier_request.go index d4ca0a4..3de605d 100644 --- a/model/supplier_request.go +++ b/model/supplier_request.go @@ -62,3 +62,8 @@ type SupplierCountReq struct { IDs []string `json:"ids"` Status string `json:"status"` // active,inactive } + +// CheckTokenSupplierPayload ... +type CheckTokenSupplierPayload struct { + Token string `json:"token"` +} diff --git a/model/warehouse_request.go b/model/warehouse_request.go index 550e870..b6cecb1 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -113,30 +113,3 @@ type WarehouseORUpdateDeliveryStatus struct { OrderID string `json:"orderId"` DeliveryStatus string `json:"deliveryStatus"` } - -// SupplierHolidayCreatePayload ... -type SupplierHolidayCreatePayload struct { - Supplier string `json:"supplier"` - Title string `json:"title"` - From string `json:"from"` - To string `json:"to"` - Warehouses []string `json:"warehouses"` - IsApplyAll bool `json:"isApplyAll"` - Source string `json:"source"` -} - -// SupplierHolidayUpdatePayload ... -type SupplierHolidayUpdatePayload struct { - Supplier string `json:"supplier"` - Title string `json:"title"` - From string `json:"from"` - To string `json:"to"` - Warehouses []string `json:"warehouses"` - IsApplyAll bool `json:"isApplyAll"` - Source string `json:"source"` -} - -// GetSupplierHolidayRequest ... -type GetSupplierHolidayRequest struct { - Conditions interface{} `json:"conditions"` -} diff --git a/model/warehouse_response.go b/model/warehouse_response.go index c38fe7c..293d2a6 100644 --- a/model/warehouse_response.go +++ b/model/warehouse_response.go @@ -173,20 +173,3 @@ type GetWarehousesResponse struct { Limit int64 `json:"limit"` List []WarehouseInfo `json:"list"` } - -// ResponseWarehouseShort ... -type ResponseWarehouseShort struct { - ID string `json:"_id"` - Name string `json:"name"` -} - -// ResponseSupplierHoliday ... -type ResponseSupplierHoliday struct { - Title string `json:"title"` - From string `json:"from"` - To string `json:"to"` - Status string `json:"status"` - Reason string `json:"reason"` - IsApplyAll bool `json:"isApplyAll"` - Warehouses []ResponseWarehouseShort `json:"warehouses"` -} diff --git a/subject/supplier.go b/subject/supplier.go index 931a3e7..890d89f 100644 --- a/subject/supplier.go +++ b/subject/supplier.go @@ -18,6 +18,7 @@ var Supplier = struct { GetFreeShipInfo string FindAllOld string Count string + CheckTokenSupplier string }{ GetListSupplierInfo: getSupplierValue("get_list_supplier_info"), GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"), @@ -30,4 +31,5 @@ var Supplier = struct { GetFreeShipInfo: getSupplierValue("get_free_ship_info"), FindAllOld: getSupplierValue("find_all_old"), Count: getSupplierValue("count"), + CheckTokenSupplier: getSupplierValue("check_token_supplier"), } diff --git a/subject/warehouse.go b/subject/warehouse.go index 56b83a4..e92ee4e 100644 --- a/subject/warehouse.go +++ b/subject/warehouse.go @@ -10,50 +10,44 @@ var Warehouse = struct { SyncWarehouseIntoServiceSupplier string CreateWarehouseIntoServiceSupplier string UpdateWarehouseIntoServiceSupplier string - CreateOutboundRequest string - UpdateOutboundRequestLogistic string - CancelOutboundRequest string - GetConfiguration string - SyncORStatus string - WebhookTNC string + CreateOutboundRequest string + UpdateOutboundRequestLogistic string + CancelOutboundRequest string + GetConfiguration string + SyncORStatus string + WebhookTNC string WebhookShiip string - WebhookGlobalCare string - WebhookOnPoint string - FindOne string - FindByCondition string - Distinct string - Count string - AfterUpdateWarehouse string - AfterCreateWarehouse string - UpdateIsClosedSupplier string - GetWarehouses string - UpdateORDeliveryStatus string - CreateSupplierHoliday string - UpdateSupplierHoliday string - GetSupplierHoliday string + WebhookGlobalCare string + WebhookOnPoint string + FindOne string + FindByCondition string + Distinct string + Count string + AfterUpdateWarehouse string + AfterCreateWarehouse string + UpdateIsClosedSupplier string + GetWarehouses string + UpdateORDeliveryStatus string }{ SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"), CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"), UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"), - AfterCreateWarehouse: getWarehouseValue("after_create_warehouse"), - AfterUpdateWarehouse: getWarehouseValue("after_update_warehouse"), - CreateOutboundRequest: getWarehouseValue("create_outbound_request"), - UpdateOutboundRequestLogistic: getWarehouseValue("update_outbound_request_logistic_info"), - CancelOutboundRequest: getWarehouseValue("cancel_outbound_request"), - GetConfiguration: getWarehouseValue("get_configuration"), - SyncORStatus: getWarehouseValue("sync_or_status"), - WebhookTNC: getWarehouseValue("webhook_tnc"), + AfterCreateWarehouse: getWarehouseValue("after_create_warehouse"), + AfterUpdateWarehouse: getWarehouseValue("after_update_warehouse"), + CreateOutboundRequest: getWarehouseValue("create_outbound_request"), + UpdateOutboundRequestLogistic: getWarehouseValue("update_outbound_request_logistic_info"), + CancelOutboundRequest: getWarehouseValue("cancel_outbound_request"), + GetConfiguration: getWarehouseValue("get_configuration"), + SyncORStatus: getWarehouseValue("sync_or_status"), + WebhookTNC: getWarehouseValue("webhook_tnc"), WebhookShiip: getWarehouseValue("webhook_shiip"), - WebhookGlobalCare: getWarehouseValue("webhook_global_care"), - WebhookOnPoint: getWarehouseValue("webhook_on_point"), - FindOne: getWarehouseValue("find_one"), - FindByCondition: getWarehouseValue("find_all_by_condition"), - Distinct: getWarehouseValue("distinct"), - Count: getWarehouseValue("count"), - UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"), - GetWarehouses: getWarehouseValue("get_warehouses"), - UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"), - CreateSupplierHoliday: getWarehouseValue("create_supplier_holiday"), - UpdateSupplierHoliday: getWarehouseValue("update_supplier_holiday"), - GetSupplierHoliday: getWarehouseValue("get_supplier_holiday"), + WebhookGlobalCare: getWarehouseValue("webhook_global_care"), + WebhookOnPoint: getWarehouseValue("webhook_on_point"), + FindOne: getWarehouseValue("find_one"), + FindByCondition: getWarehouseValue("find_all_by_condition"), + Distinct: getWarehouseValue("distinct"), + Count: getWarehouseValue("count"), + UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"), + GetWarehouses: getWarehouseValue("get_warehouses"), + UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"), }