fix conflict

client/warehouse.go

@@ -17,6 +17,24 @@ func GetWarehouse() Warehouse {
 	return Warehouse{}
 }
 
+// UpdateIsClosedSupplier ...
+func (w Warehouse) UpdateIsClosedSupplier(p model.WarehouseNatsResponse) error {
+	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateIsClosedSupplier, toBytes(p))
+	if err != nil {
+		return err
+	}
+	var r struct {
+		Error string `json:"error"`
+	}
+	if err = json.Unmarshal(msg.Data, &r); err != nil {
+		return err
+	}
+	if r.Error != "" {
+		return errors.New(r.Error)
+	}
+	return nil
+}
+
 // AfterCreateWarehouse ...
 func (w Warehouse) AfterCreateWarehouse(p model.WarehouseNatsResponse) error {
 	msg, err := natsio.GetServer().Request(subject.Warehouse.AfterCreateWarehouse, toBytes(p))

model/supplier_response.go

@@ -4,6 +4,7 @@ package model
 type ResponseSupplierInfo struct {
 	ID           string `json:"id"`
 	Name         string `json:"name"`
+	BusinessType string `json:"businessType"`
 }
 
 // ResponseSupplierContract ...
@@ -19,6 +20,7 @@ type SupplierBrief struct {
 	ID           string `json:"_id"`
 	Name         string `json:"name"`
 	Status       string `json:"status"`
+	BusinessType string `json:"businessType"`
 	CreatedAt    string `json:"createdAt"`
 	UpdatedAt    string `json:"updatedAt"`
 }

model/warehouse_request.go

@@ -69,3 +69,14 @@ type SyncORStatusRequest struct {
 	ORCode    string `json:"orCode"`
 	OrderCode string `json:"orderCode"`
 }
+
+// UpdateSupplierIsClosedRequest ...
+type UpdateSupplierIsClosedRequest struct {
+	Suppliers []SupplierIsClosed `json:"suppliers"`
+}
+
+// SupplierIsClosed ...
+type SupplierIsClosed struct {
+	Supplier string `json:"supplier"`
+	IsClosed bool   `json:"isClosed"`
+}

model/warehouse_response.go

@@ -25,6 +25,20 @@ type WarehouseConfiguration struct {
 	Partner                 WarehousePartner  `json:"partner"`
 	Delivery                WarehouseDelivery `json:"delivery"`
 	Other                   WarehouseOther    `json:"other"`
+	Food                    WarehouseFood     `json:"food"`
+}
+
+// WarehouseFood ...
+type WarehouseFood struct {
+	ForceClosed bool        `json:"forceClosed"`
+	IsClosed    bool        `json:"isClosed"`
+	TimeRange   []TimeRange `json:"timeRange"`
+}
+
+// TimeRange ...
+type TimeRange struct {
+	From int64 `json:"from"`
+	To   int64 `json:"to"`
 }
 
 // WarehouseOther ...
@@ -109,6 +123,7 @@ type ResponseLatLng struct {
 type WarehouseNatsResponse struct {
 	ID             string                    `json:"_id"`
 	Staff          string                    `json:"staff"`
+	BusinessType   string                    `json:"businessType"`
 	Name           string                    `json:"name"`
 	SearchString   string                    `json:"searchString"`
 	Slug           string                    `json:"slug"`

subject/warehouse.go

@@ -20,6 +20,7 @@ var Warehouse = struct {
 	Count                         string
 	AfterUpdateWarehouse          string
 	AfterCreateWarehouse          string
+	UpdateIsClosedSupplier        string
 	CreateWarehouseIntoServiceSupplier string
 	UpdateWarehouseIntoServiceSupplier string
 }{
@@ -36,6 +37,7 @@ var Warehouse = struct {
 	FindByCondition:               getWarehouseValue("find_all_by_condition"),
 	Distinct:                      getWarehouseValue("distinct"),
 	Count:                         getWarehouseValue("count"),
+	UpdateIsClosedSupplier:        getWarehouseValue("update_is_closed_supplier"),
 	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
 }