Selly-Modules
/
natsio
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix conflix

This commit is contained in:
buiphuan0211 2022-12-23 14:52:00 +07:00
parent 4acbf78c22 daac1da25d
commit c336e034f8
7 changed files with 61 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/supplier.go
View File

@ -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
}

63
client/warehouse.go
View File

@ -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
}

5
model/supplier_request.go
View File

@ -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"`
}

27
model/warehouse_request.go
View File

@ -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"`
}

17
model/warehouse_response.go
View File

@ -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"`
}

2
subject/supplier.go
View File

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

6
subject/warehouse.go
View File

@ -28,9 +28,6 @@ var Warehouse = struct {
UpdateIsClosedSupplier string
GetWarehouses string
UpdateORDeliveryStatus string
CreateSupplierHoliday string
UpdateSupplierHoliday string
GetSupplierHoliday string
}{
SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
@ -53,7 +50,4 @@ var Warehouse = struct {
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"),
}