Compare commits
No commits in common. "master" and "feature/selly-mall-v1-kin" have entirely different histories.
master
...
feature/se
|
@ -146,25 +146,6 @@ func (w Warehouse) GetConfigByWarehouseID(warehouseID string) (*model.WarehouseC
|
||||||
return r.Data, nil
|
return r.Data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetListConfig ...
|
|
||||||
func (w Warehouse) GetListConfig(req model.GetListWarehouseConfigReq) ([]*model.WarehouseConfiguration, error) {
|
|
||||||
msg, err := natsio.GetServer().Request(subject.Warehouse.GetListWarehouseConfig, toBytes(req))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var r struct {
|
|
||||||
Data []*model.WarehouseConfiguration `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
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetWarehouses ...
|
// GetWarehouses ...
|
||||||
func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWarehousesResponse, error) {
|
func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWarehousesResponse, error) {
|
||||||
msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
|
msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
|
||||||
|
|
|
@ -3,7 +3,6 @@ package client
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"git.selly.red/Selly-Modules/natsio"
|
"git.selly.red/Selly-Modules/natsio"
|
||||||
"git.selly.red/Selly-Modules/natsio/model"
|
"git.selly.red/Selly-Modules/natsio/model"
|
||||||
"git.selly.red/Selly-Modules/natsio/subject"
|
"git.selly.red/Selly-Modules/natsio/subject"
|
||||||
|
@ -84,39 +83,3 @@ func (w Warehouse) FindByCondition(p model.FindWithCondition) ([]*model.Warehous
|
||||||
}
|
}
|
||||||
return r.Data, nil
|
return r.Data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateWarehouseConfig ...
|
|
||||||
func (w Warehouse) UpdateWarehouseConfig(p model.UpdatePayload) error {
|
|
||||||
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateWarehouseConfig, bsonToBytes(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
|
|
||||||
}
|
|
||||||
|
|
||||||
// BulkWriteWarehouseConfig ...
|
|
||||||
func (w Warehouse) BulkWriteWarehouseConfig(p model.UpdatePayload) error {
|
|
||||||
msg, err := natsio.GetServer().Request(subject.Warehouse.BulkWriteWarehouseConfig, bsonToBytes(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
|
|
||||||
}
|
|
||||||
|
|
|
@ -43,14 +43,3 @@ type RequestCondition struct {
|
||||||
Page int64 `json:"page"`
|
Page int64 `json:"page"`
|
||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdatePayload struct {
|
|
||||||
Conditions interface{} `json:"conditions"`
|
|
||||||
Payload interface{} `json:"payload"`
|
|
||||||
Opts []*options.UpdateOptions `json:"opts"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type WebhookPayloadV2 struct {
|
|
||||||
Path string `json:"path"` // request URL path from external
|
|
||||||
Data string `json:"data"` // request body
|
|
||||||
}
|
|
||||||
|
|
|
@ -5,9 +5,6 @@ type CommunicationRequestHttp struct {
|
||||||
ResponseImmediately bool `json:"responseImmediately"`
|
ResponseImmediately bool `json:"responseImmediately"`
|
||||||
Authentication string `json:"authentication"`
|
Authentication string `json:"authentication"`
|
||||||
Payload HttpRequest `json:"payload"`
|
Payload HttpRequest `json:"payload"`
|
||||||
|
|
||||||
// collection to store log data, will be prepended with log-, default it stored in logs collections
|
|
||||||
LogTarget string `json:"logTarget"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// HttpRequest ...
|
// HttpRequest ...
|
||||||
|
|
|
@ -32,13 +32,6 @@ type (
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Code int `json:"code"`
|
Code int `json:"code"`
|
||||||
Slug string `json:"slug"`
|
Slug string `json:"slug"`
|
||||||
Location *GEOLocation `json:"location"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GEOLocation ...
|
|
||||||
GEOLocation struct {
|
|
||||||
Type string `bson:"type" json:"type"`
|
|
||||||
Coordinates []float64 `bson:"coordinates" json:"coordinates"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// LocationProvinceResponse ...
|
// LocationProvinceResponse ...
|
||||||
|
@ -90,6 +83,5 @@ type (
|
||||||
Code int `json:"code"`
|
Code int `json:"code"`
|
||||||
DistrictCode int `json:"districtCode"`
|
DistrictCode int `json:"districtCode"`
|
||||||
ProvinceCode int `json:"provinceCode"`
|
ProvinceCode int `json:"provinceCode"`
|
||||||
Location *GEOLocation `json:"location"`
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
@ -42,7 +42,6 @@ type OutboundRequestItem struct {
|
||||||
UnitCode string `json:"unitCode"`
|
UnitCode string `json:"unitCode"`
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
PartnerProductCode string `json:"partnerProductCode"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CustomerInfo ...
|
// CustomerInfo ...
|
||||||
|
@ -64,12 +63,11 @@ type AddressDetail struct {
|
||||||
|
|
||||||
// UpdateOutboundRequestLogisticInfoPayload ...
|
// UpdateOutboundRequestLogisticInfoPayload ...
|
||||||
type UpdateOutboundRequestLogisticInfoPayload struct {
|
type UpdateOutboundRequestLogisticInfoPayload struct {
|
||||||
ShippingLabel string `json:"shippingLabel,omitempty"`
|
ShippingLabel string `json:"shippingLabel"`
|
||||||
TrackingCode string `json:"trackingCode,omitempty"`
|
TrackingCode string `json:"trackingCode"`
|
||||||
ORCode string `json:"orCode,omitempty"`
|
ORCode string `json:"orCode"`
|
||||||
TPLCode string `json:"tplCode,omitempty"`
|
TPLCode string `json:"tplCode"`
|
||||||
OrderID string `json:"orderId"`
|
OrderID string `json:"orderId"`
|
||||||
DeliveryStatus string `json:"deliveryStatus,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CancelOutboundRequest ...
|
// CancelOutboundRequest ...
|
||||||
|
@ -132,8 +130,3 @@ type UpdateStatusWarehousePendingInactive struct {
|
||||||
WarehouseID string `json:"warehouse"`
|
WarehouseID string `json:"warehouse"`
|
||||||
PendingInactive bool `json:"pendingInactive"`
|
PendingInactive bool `json:"pendingInactive"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetListWarehouseConfigReq struct {
|
|
||||||
PartnerCode string `json:"partnerCode"`
|
|
||||||
PartnerIdentityCode string `json:"partnerIdentityCode"`
|
|
||||||
}
|
|
||||||
|
|
|
@ -66,9 +66,6 @@ type WarehouseOrder struct {
|
||||||
IsLimitNumberOfPurchases bool `json:"isLimitNumberOfPurchases"`
|
IsLimitNumberOfPurchases bool `json:"isLimitNumberOfPurchases"`
|
||||||
LimitNumberOfPurchases int64 `json:"limitNumberOfPurchases"`
|
LimitNumberOfPurchases int64 `json:"limitNumberOfPurchases"`
|
||||||
NotifyOnNewOrder WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"`
|
NotifyOnNewOrder WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"`
|
||||||
LabelSize string `json:"labelSize"`
|
|
||||||
MaximumOrderValue float64 `json:"maximumOrderValue"`
|
|
||||||
MaximumNumberPerBuyerEachMonth int64 `json:"maximumNumberPerBuyerEachMonth"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// WarehouseConfigNotifyOnNewOrder ...
|
// WarehouseConfigNotifyOnNewOrder ...
|
||||||
|
@ -156,8 +153,6 @@ type WarehouseNatsResponse struct {
|
||||||
UpdatedAt time.Time `json:"updatedAt"`
|
UpdatedAt time.Time `json:"updatedAt"`
|
||||||
ReasonPendingInactive string `json:"reasonPendingInactive"`
|
ReasonPendingInactive string `json:"reasonPendingInactive"`
|
||||||
IsPendingInactive bool `json:"isPendingInactive"`
|
IsPendingInactive bool `json:"isPendingInactive"`
|
||||||
IsFromInternational bool `json:"isFromInternational"`
|
|
||||||
StoreCode string `json:"storeCode"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// WarehouseInfo ...
|
// WarehouseInfo ...
|
||||||
|
@ -186,9 +181,3 @@ type GetWarehousesResponse struct {
|
||||||
Limit int64 `json:"limit"`
|
Limit int64 `json:"limit"`
|
||||||
List []WarehouseInfo `json:"list"`
|
List []WarehouseInfo `json:"list"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetListWarehouseConfigRes struct {
|
|
||||||
Total int64 `json:"total"`
|
|
||||||
Limit int64 `json:"limit"`
|
|
||||||
List []WarehouseConfiguration `json:"list"`
|
|
||||||
}
|
|
||||||
|
|
|
@ -12,15 +12,9 @@ var Product = struct {
|
||||||
CreateRequestStep string
|
CreateRequestStep string
|
||||||
ProcessApplyRequest string
|
ProcessApplyRequest string
|
||||||
RequestChangeStatus string
|
RequestChangeStatus string
|
||||||
WebhookStockUpdate string // WebhookStockUpdate Kiotviet queue
|
|
||||||
OPWebhookStockUpdate string // OPWebhookStockUpdate Onpoint queue
|
|
||||||
OrderPaymentBankTransferWebhookCheckAndUpdateStatus string
|
|
||||||
}{
|
}{
|
||||||
ApplyRequest: getProductValue("apply_request"),
|
ApplyRequest: getProductValue("apply_request"),
|
||||||
CreateRequestStep: getProductValue("create_request_step"),
|
CreateRequestStep: getProductValue("create_request_step"),
|
||||||
ProcessApplyRequest: getProductValue("process_apply_request"),
|
ProcessApplyRequest: getProductValue("process_apply_request"),
|
||||||
RequestChangeStatus: getProductValue("request_change_status"),
|
RequestChangeStatus: getProductValue("request_change_status"),
|
||||||
WebhookStockUpdate: getProductValue("webhook_stock_update"),
|
|
||||||
OPWebhookStockUpdate: getProductValue("op_webhook_stock_update"),
|
|
||||||
OrderPaymentBankTransferWebhookCheckAndUpdateStatus: getProductValue("order_payment_bank_transfer_webhook_check_and_update_status"),
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ var Warehouse = struct {
|
||||||
WebhookTNC string
|
WebhookTNC string
|
||||||
WebhookGlobalCare string
|
WebhookGlobalCare string
|
||||||
WebhookOnPoint string
|
WebhookOnPoint string
|
||||||
WebhookViettelFFM string
|
|
||||||
FindOne string
|
FindOne string
|
||||||
FindByCondition string
|
FindByCondition string
|
||||||
Distinct string
|
Distinct string
|
||||||
|
@ -31,9 +30,6 @@ var Warehouse = struct {
|
||||||
UpdateORDeliveryStatus string
|
UpdateORDeliveryStatus string
|
||||||
UpdateStatusWarehousePendingInactive string
|
UpdateStatusWarehousePendingInactive string
|
||||||
UpdateIsSellyMall string
|
UpdateIsSellyMall string
|
||||||
UpdateWarehouseConfig string
|
|
||||||
BulkWriteWarehouseConfig string
|
|
||||||
GetListWarehouseConfig 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"),
|
||||||
|
@ -47,7 +43,6 @@ var Warehouse = struct {
|
||||||
WebhookTNC: getWarehouseValue("webhook_tnc"),
|
WebhookTNC: getWarehouseValue("webhook_tnc"),
|
||||||
WebhookGlobalCare: getWarehouseValue("webhook_global_care"),
|
WebhookGlobalCare: getWarehouseValue("webhook_global_care"),
|
||||||
WebhookOnPoint: getWarehouseValue("webhook_on_point"),
|
WebhookOnPoint: getWarehouseValue("webhook_on_point"),
|
||||||
WebhookViettelFFM: getWarehouseValue("webhook_viettel_ffm"),
|
|
||||||
FindOne: getWarehouseValue("find_one"),
|
FindOne: getWarehouseValue("find_one"),
|
||||||
FindByCondition: getWarehouseValue("find_all_by_condition"),
|
FindByCondition: getWarehouseValue("find_all_by_condition"),
|
||||||
Distinct: getWarehouseValue("distinct"),
|
Distinct: getWarehouseValue("distinct"),
|
||||||
|
@ -57,7 +52,4 @@ var Warehouse = struct {
|
||||||
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
|
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
|
||||||
UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"),
|
UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"),
|
||||||
UpdateIsSellyMall: getWarehouseValue("update_is_selly_mall"),
|
UpdateIsSellyMall: getWarehouseValue("update_is_selly_mall"),
|
||||||
UpdateWarehouseConfig: getWarehouseValue("update_warehouse_config"),
|
|
||||||
BulkWriteWarehouseConfig: getWarehouseValue("bulk_write_warehouse_config"),
|
|
||||||
GetListWarehouseConfig: getWarehouseValue("get_list_warehouse_config"),
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue