fix-holiday-product_merge_dev #131

Merged
Ghost merged 2 commits from fix-holiday-product_merge_dev into develop 2023-01-17 04:23:59 +00:00
3 changed files with 68 additions and 39 deletions
Showing only changes of commit f9b2edb032 - Show all commits

View File

@ -182,3 +182,23 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
} }
return nil return nil
} }
// UpdatePendingActiveProductByWarehouseIDs ...
func (w Warehouse) UpdatePendingActiveProductByWarehouseIDs(p model.UpdatePendingActiveProductRequest) error {
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingActiveProductByWarehouseIDs, 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: update_pending_active_product_by_warehouse_ids %v", err)
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

View File

@ -113,3 +113,8 @@ type WarehouseORUpdateDeliveryStatus struct {
OrderID string `json:"orderId"` OrderID string `json:"orderId"`
DeliveryStatus string `json:"deliveryStatus"` DeliveryStatus string `json:"deliveryStatus"`
} }
// UpdatePendingActiveProductRequest ...
type UpdatePendingActiveProductRequest struct {
WarehouseIDs []string `json:"warehouseIDs"`
}

View File

@ -1,6 +1,8 @@
package subject package subject
import "fmt" import (
"fmt"
)
func getWarehouseValue(val string) string { func getWarehouseValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.Warehouse, val) return fmt.Sprintf("%s.%s", prefixes.Warehouse, val)
@ -26,6 +28,7 @@ var Warehouse = struct {
UpdateIsClosedSupplier string UpdateIsClosedSupplier string
GetWarehouses string GetWarehouses string
UpdateORDeliveryStatus string UpdateORDeliveryStatus string
UpdatePendingActiveProductByWarehouseIDs string
}{ }{
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"), CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"), UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
@ -46,4 +49,5 @@ var Warehouse = struct {
UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"), UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"),
GetWarehouses: getWarehouseValue("get_warehouses"), GetWarehouses: getWarehouseValue("get_warehouses"),
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"), UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
UpdatePendingActiveProductByWarehouseIDs: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
} }