Compare commits
51 Commits
master
...
feature/ge
Author | SHA1 | Date |
---|---|---|
QuanTT0110 | b7d963cc90 | |
quang1472001 | d71d7f0eb4 | |
Tue | af44ea63f4 | |
Tue | c7ad6baf4c | |
Minh Nguyen | 539aa79128 | |
Nguyen Minh | 42874f4937 | |
quang1472001 | ed0f16623a | |
quang1472001 | 3e13cb55b3 | |
quang1472001 | cebb3214cf | |
quang1472001 | b9b55d144e | |
quang1472001 | 29b2b861ff | |
quang1472001 | a86a097886 | |
quang1472001 | 863e924a5e | |
quang1472001 | 7a3e50ef97 | |
Sinh | 13a465b627 | |
Sinh | baf8a98e35 | |
Sinh | 7f57a9bd97 | |
trunglt251292 | 8fe3b39134 | |
Sinh | 68146c7c2a | |
Sinh | 439d1a0d5a | |
Minh Nguyen | ed564effe6 | |
Minh Nguyen | c2acdaf244 | |
Minh Nguyen | 40e5219036 | |
Minh Nguyen | df9ccf9d69 | |
Minh Nguyen | e61ae3c10d | |
Nguyen Minh | 36ad0b4972 | |
quang1472001 | d7c0138d6a | |
quang1472001 | 021df099cc | |
Minh Nguyen | 08a9fdabe0 | |
Sinh | d06719b0e6 | |
Sinh | 73181bc583 | |
Tue | 6b168cd98a | |
Minh Nguyen | 4a5adc610e | |
trunglt251292 | a9cc99994f | |
trunglt251292 | 6bd4ebce2e | |
trunglt251292 | 3c5c95b103 | |
trunglt251292 | a261c32dc4 | |
Sinh | fa5be3e17c | |
Sinh | 9e4e6868a4 | |
anbuiselly | c449dd44f1 | |
Sinh | af85d25516 | |
Sinh | b5ba7c7bf1 | |
Minh Nguyen | 389507050a | |
Sinh | 86269e4292 | |
Sinh | 48e585dc16 | |
Tue | 22cd1eb18f | |
Tue | 44f0e4be44 | |
trunglt251292 | ddc0af6338 | |
trunglt251292 | 5f5bfeb182 | |
Nguyen Minh | 139dc6a865 | |
Tue | 4546d0e89b |
|
@ -28,7 +28,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
|
|||
Data *model.ResponseLocationAddress `json:"data"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err := json.Unmarshal(msg.Data, &r); err != nil {
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
|
|||
return r.Data, nil
|
||||
}
|
||||
|
||||
// GetProvincesByCodes ... ...
|
||||
// GetProvincesByCodes ...
|
||||
func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodes, toBytes(p))
|
||||
if err != nil {
|
||||
|
@ -46,11 +46,11 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo
|
|||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.LocationProvinceResponse `json:"data"'`
|
||||
Data *model.LocationProvinceResponse `json:"data"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(msg.Data, &r); err != nil {
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -71,7 +71,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
|
|||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(msg.Data, &r); err != nil {
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -94,7 +94,7 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
|
|||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(msg.Data, &r); err != nil {
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -104,3 +104,211 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
|
|||
|
||||
return r.Data, nil
|
||||
}
|
||||
|
||||
// GetProvinceByCondition ...
|
||||
func (l Location) GetProvinceByCondition(p model.ProvinceRequestCondition) (*model.LocationProvinceDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetProvinceByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.LocationProvinceDetailResponse `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
|
||||
}
|
||||
|
||||
// GetProvincesByCondition ...
|
||||
func (l Location) GetProvincesByCondition(p model.ProvinceRequestCondition) ([]*model.LocationProvinceDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data []*model.LocationProvinceDetailResponse `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
|
||||
}
|
||||
|
||||
// GetDistrictByCondition ...
|
||||
func (l Location) GetDistrictByCondition(p model.DistrictRequestCondition) (*model.LocationDistrictDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.LocationDistrictDetailResponse `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
|
||||
}
|
||||
|
||||
// GetDistrictsByCondition ...
|
||||
func (l Location) GetDistrictsByCondition(p model.DistrictRequestCondition) ([]*model.LocationDistrictDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data []*model.LocationDistrictDetailResponse `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
|
||||
}
|
||||
|
||||
// GetWardByCondition ...
|
||||
func (l Location) GetWardByCondition(p model.WardRequestCondition) (*model.LocationWardDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetWardByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.LocationWardDetailResponse `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
|
||||
}
|
||||
|
||||
// GetWardsByCondition ...
|
||||
func (l Location) GetWardsByCondition(p model.WardRequestCondition) ([]*model.LocationWardDetailResponse, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data []*model.LocationWardDetailResponse `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
|
||||
}
|
||||
|
||||
// CountProvinceByCondition ...
|
||||
func (l Location) CountProvinceByCondition(p model.ProvinceRequestCondition) (int64, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.CountProvinceByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
var r struct {
|
||||
Data int64 `json:"data"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if r.Error != "" {
|
||||
return 0, errors.New(r.Error)
|
||||
}
|
||||
return r.Data, nil
|
||||
}
|
||||
|
||||
// CountDistrictByCondition ...
|
||||
func (l Location) CountDistrictByCondition(p model.DistrictRequestCondition) (int64, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.CountDistrictByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
var r struct {
|
||||
Data int64 `json:"data"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if r.Error != "" {
|
||||
return 0, errors.New(r.Error)
|
||||
}
|
||||
return r.Data, nil
|
||||
}
|
||||
|
||||
// CountWardByCondition ...
|
||||
func (l Location) CountWardByCondition(p model.WardRequestCondition) (int64, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.CountWardByCondition, toBytes(p))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
var r struct {
|
||||
Data int64 `json:"data"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if r.Error != "" {
|
||||
return 0, errors.New(r.Error)
|
||||
}
|
||||
return r.Data, nil
|
||||
}
|
||||
|
||||
// DistinctWithField ...
|
||||
func (l Location) DistinctWithField(p model.ProvinceDistinctWithField) ([]interface{}, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Location.ProvinceDistinctWithField, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var r struct {
|
||||
Data []interface{} `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
|
||||
}
|
||||
|
|
|
@ -98,3 +98,24 @@ func (o Order) ORNotUpdateStatus(p model.OrderORsNotUpdateStatus) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetSupplierOrders ...
|
||||
func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrderList, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Order.GetSupplierOrders, toBytes(p))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var (
|
||||
r struct {
|
||||
Data model.SupplierOrderList `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
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package client
|
|||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
|
||||
"git.selly.red/Selly-Modules/natsio"
|
||||
"git.selly.red/Selly-Modules/natsio/model"
|
||||
|
@ -80,27 +81,6 @@ func (s Supplier) FindAll(supplierID model.SupplierRequestPayload) (*model.Suppl
|
|||
return r.Data, nil
|
||||
}
|
||||
|
||||
func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*model.SupplierAll, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Supplier.FindAll, toBytes(supplierID))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.SupplierAll `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
|
||||
}
|
||||
|
||||
// CreateWarehouseIntoServiceSupplier ...
|
||||
func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error {
|
||||
msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p))
|
||||
|
@ -136,3 +116,25 @@ func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWareh
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetWarehouseFreeship ...
|
||||
func (s Supplier) GetWarehouseFreeship() (*model.ResponseListWarehouseIDByBusinessType, error) {
|
||||
msg, err := natsio.GetServer().Request(subject.Supplier.GetListWarehouseFreeship, toBytes(bson.M{}))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r struct {
|
||||
Data *model.ResponseListWarehouseIDByBusinessType `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
|
||||
}
|
||||
|
|
|
@ -1,23 +1,65 @@
|
|||
package model
|
||||
|
||||
// LocationRequestPayload ...
|
||||
type LocationRequestPayload struct {
|
||||
Province int `json:"province"`
|
||||
District int `json:"district"`
|
||||
Ward int `json:"ward"`
|
||||
}
|
||||
type (
|
||||
LocationRequestPayload struct {
|
||||
Province int `json:"province"`
|
||||
District int `json:"district"`
|
||||
Ward int `json:"ward"`
|
||||
}
|
||||
|
||||
// ProvinceRequestPayload ...
|
||||
type ProvinceRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
// ProvinceRequestPayload ...
|
||||
ProvinceRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
|
||||
// DistrictRequestPayload ...
|
||||
type DistrictRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
// ProvinceRequestCondition ...
|
||||
ProvinceRequestCondition struct {
|
||||
Code int `json:"code"`
|
||||
Codes []int `json:"codes"`
|
||||
Slug string `json:"slug"`
|
||||
Slugs []string `json:"slugs"`
|
||||
Keyword string `json:"keyword"`
|
||||
Region string `json:"region"`
|
||||
}
|
||||
|
||||
// WardRequestPayload ...
|
||||
type WardRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
// DistrictRequestPayload ...
|
||||
DistrictRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
|
||||
// DistrictRequestCondition ...
|
||||
DistrictRequestCondition struct {
|
||||
Code int `json:"code"`
|
||||
Codes []int `json:"codes"`
|
||||
ProvinceCode int `json:"provinceCode"`
|
||||
Slug string `json:"slug"`
|
||||
ProvinceSlug string `json:"provinceSlug"`
|
||||
Keyword string `json:"keyword"`
|
||||
}
|
||||
|
||||
// WardRequestPayload ...
|
||||
WardRequestPayload struct {
|
||||
Codes []int `json:"codes"`
|
||||
}
|
||||
|
||||
// WardRequestCondition ...
|
||||
WardRequestCondition struct {
|
||||
Code int `json:"code"`
|
||||
Codes []int `json:"codes"`
|
||||
DistrictCode int `json:"districtCode"`
|
||||
ProvinceCode int `json:"provinceCode"`
|
||||
Slug string `json:"slug"`
|
||||
DistrictSlug string `json:"districtSlug"`
|
||||
ProvinceSlug string `json:"provinceSlug"`
|
||||
Keyword string `json:"keyword"`
|
||||
}
|
||||
|
||||
// ProvinceDistinctWithField ...
|
||||
ProvinceDistinctWithField struct {
|
||||
Conditions struct {
|
||||
Region string `json:"region"`
|
||||
} `json:"conditions"`
|
||||
Field string `json:"filed"`
|
||||
}
|
||||
)
|
||||
|
|
|
@ -1,43 +1,96 @@
|
|||
package model
|
||||
|
||||
type ResponseLocationAddress struct {
|
||||
Province LocationProvince `json:"province"`
|
||||
District LocationDistrict `json:"district"`
|
||||
Ward LocationWard `json:"ward"`
|
||||
}
|
||||
import "time"
|
||||
|
||||
// LocationProvince ...
|
||||
type LocationProvince struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
}
|
||||
type (
|
||||
// ResponseLocationAddress ...
|
||||
ResponseLocationAddress struct {
|
||||
Province LocationProvince `json:"province"`
|
||||
District LocationDistrict `json:"district"`
|
||||
Ward LocationWard `json:"ward"`
|
||||
}
|
||||
|
||||
// LocationDistrict ...
|
||||
type LocationDistrict struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
}
|
||||
// LocationProvince ...
|
||||
LocationProvince struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
RegionCode string `json:"regionCode"`
|
||||
MainRegionCode string `json:"mainRegionCode"`
|
||||
}
|
||||
|
||||
// LocationWard ...
|
||||
type LocationWard struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
}
|
||||
// LocationDistrict ...
|
||||
LocationDistrict struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
}
|
||||
|
||||
// LocationProvinceResponse ...
|
||||
type LocationProvinceResponse struct {
|
||||
Provinces []LocationProvince `json:"provinces"`
|
||||
}
|
||||
// LocationWard ...
|
||||
LocationWard struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Code int `json:"code"`
|
||||
}
|
||||
|
||||
// LocationDistrictResponse ...
|
||||
type LocationDistrictResponse struct {
|
||||
Districts []LocationDistrict `json:"districts"`
|
||||
}
|
||||
// LocationProvinceResponse ...
|
||||
LocationProvinceResponse struct {
|
||||
Provinces []LocationProvince `json:"provinces"`
|
||||
}
|
||||
|
||||
// LocationWardResponse ...
|
||||
type LocationWardResponse struct {
|
||||
Wards []LocationWard `json:"wards"`
|
||||
}
|
||||
// LocationDistrictResponse ...
|
||||
LocationDistrictResponse struct {
|
||||
Districts []LocationDistrict `json:"districts"`
|
||||
}
|
||||
|
||||
// LocationWardResponse ...
|
||||
LocationWardResponse struct {
|
||||
Wards []LocationWard `json:"wards"`
|
||||
}
|
||||
|
||||
// LocationProvinceDetailResponse ...
|
||||
LocationProvinceDetailResponse struct {
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
SearchString string `json:"searchString"`
|
||||
Slug string `json:"slug"`
|
||||
OldSlug string `json:"oldSlug"`
|
||||
Code int `json:"code"`
|
||||
CountryCode string `json:"countryCode"`
|
||||
RegionCode string `json:"regionCode"`
|
||||
MainRegionCode string `json:"mainRegionCode"`
|
||||
TotalDistricts int `json:"totalDistricts"`
|
||||
TotalWards int `json:"totalWards"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
// LocationDistrictDetailResponse ...
|
||||
LocationDistrictDetailResponse struct {
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
SearchString string `json:"searchString"`
|
||||
Slug string `json:"slug"`
|
||||
OldSlug string `json:"oldSlug"`
|
||||
Code int `json:"code"`
|
||||
ProvinceCode int `json:"provinceCode"`
|
||||
Area int `json:"area"`
|
||||
TotalWards int `json:"totalWards"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
// LocationWardDetailResponse ...
|
||||
LocationWardDetailResponse struct {
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
SearchString string `json:"searchString"`
|
||||
Slug string `json:"slug"`
|
||||
OldSlugs []string `json:"oldSlugs"`
|
||||
Code int `json:"code"`
|
||||
DistrictCode int `json:"districtCode"`
|
||||
ProvinceCode int `json:"provinceCode"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
)
|
||||
|
|
|
@ -38,3 +38,13 @@ type OrderUpdateLogisticInfoFailed struct {
|
|||
type OrderORsNotUpdateStatus struct {
|
||||
ORCodes []string `json:"orCodes"`
|
||||
}
|
||||
|
||||
// OrderSupplierQuery ...
|
||||
type OrderSupplierQuery struct {
|
||||
Limit int64 `json:"limit"`
|
||||
Page int64 `json:"page"`
|
||||
FromDate string `json:"fromDate"`
|
||||
ToDate string `json:"toDate"`
|
||||
SupplierID string `json:"supplierId"`
|
||||
WarehouseIDs []string `json:"warehouseIDs"`
|
||||
}
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
package model
|
||||
|
||||
import "time"
|
||||
|
||||
// SupplierOrderList ...
|
||||
type SupplierOrderList struct {
|
||||
List []SupplierOrder `json:"list"`
|
||||
Total int64 `json:"total" example:"100"`
|
||||
Limit int64 `json:"limit" example:"20"`
|
||||
}
|
||||
|
||||
// SupplierOrder ...
|
||||
type SupplierOrder struct {
|
||||
ID string `json:"_id"`
|
||||
Code string `json:"code"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
Status string `json:"status"`
|
||||
WarehouseStatus string `json:"warehouseStatus"`
|
||||
Items []SupplierOrderItem `json:"items"`
|
||||
Delivery SupplierOrderDelivery `json:"delivery"`
|
||||
}
|
||||
|
||||
// SupplierOrderItem ...
|
||||
type SupplierOrderItem struct {
|
||||
ID string `json:"_id" example:"1231"`
|
||||
SupplierSKU string `json:"supplierSku" example:"SUPPLIER_SKU"`
|
||||
Quantity int64 `json:"quantity" example:"2"`
|
||||
}
|
||||
|
||||
// SupplierOrderDelivery ...
|
||||
type SupplierOrderDelivery struct {
|
||||
Code string `json:"code" example:"123187287"`
|
||||
Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
|
||||
TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
|
||||
}
|
|
@ -21,16 +21,25 @@ type ResponseListSellerInfoSupportChat struct {
|
|||
|
||||
// ResponseSellerInfoSupportChat ...
|
||||
type ResponseSellerInfoSupportChat struct {
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
Code string `json:"code"`
|
||||
Membership SellerMembershipInfo `json:"membership"`
|
||||
Info SellerContactInfo `json:"info"`
|
||||
Team *TeamInfo `json:"team,omitempty"`
|
||||
Statistic SellerStatistic `json:"statistic"`
|
||||
TrackingTime *SellerTrackingTime `json:"trackingTime"`
|
||||
Invitee *InviteeInfo `json:"invitee"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
Code string `json:"code"`
|
||||
Membership SellerMembershipInfo `json:"membership"`
|
||||
Info SellerContactInfo `json:"info"`
|
||||
Team *TeamInfo `json:"team,omitempty"`
|
||||
Statistic SellerStatistic `json:"statistic"`
|
||||
TrackingTime *SellerTrackingTime `json:"trackingTime"`
|
||||
Invitee *InviteeInfo `json:"invitee"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
PlanPackage *SellerPlanPackageInfo `json:"planPackage"`
|
||||
}
|
||||
|
||||
// SellerPlanPackageInfo ...
|
||||
type SellerPlanPackageInfo struct {
|
||||
ID string `json:"_id"`
|
||||
Name string `json:"name"`
|
||||
Level int `json:"level"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
}
|
||||
|
||||
// SellerTrackingTime ...
|
||||
|
|
|
@ -29,3 +29,7 @@ type SupplierAll struct {
|
|||
Suppliers []SupplierBrief `json:"suppliers"`
|
||||
Total int64 `json:"total"`
|
||||
}
|
||||
|
||||
type ResponseListWarehouseIDByBusinessType struct {
|
||||
Warehouses []string `json:"warehouses"`
|
||||
}
|
||||
|
|
|
@ -36,9 +36,11 @@ type InsuranceOpts struct {
|
|||
|
||||
// OutboundRequestItem ...
|
||||
type OutboundRequestItem struct {
|
||||
SupplierSKU string `json:"supplierSKU"`
|
||||
Quantity int64 `json:"quantity"`
|
||||
UnitCode string `json:"unitCode"`
|
||||
SupplierSKU string `json:"supplierSKU"`
|
||||
Quantity int64 `json:"quantity"`
|
||||
UnitCode string `json:"unitCode"`
|
||||
Price float64 `json:"price"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// CustomerInfo ...
|
||||
|
@ -63,6 +65,7 @@ type UpdateOutboundRequestLogisticInfoPayload struct {
|
|||
ShippingLabel string `json:"shippingLabel"`
|
||||
TrackingCode string `json:"trackingCode"`
|
||||
ORCode string `json:"orCode"`
|
||||
TPLCode string `json:"tplCode"`
|
||||
}
|
||||
|
||||
// CancelOutboundRequest ...
|
||||
|
|
|
@ -7,13 +7,33 @@ func getLocationValue(val string) string {
|
|||
}
|
||||
|
||||
var Location = struct {
|
||||
GetLocationByCode string
|
||||
GetProvincesByCodes string
|
||||
GetDistrictsByCodes string
|
||||
GetWardsByCodes string
|
||||
GetLocationByCode string
|
||||
GetProvincesByCodes string
|
||||
GetDistrictsByCodes string
|
||||
GetWardsByCodes string
|
||||
GetProvinceByCondition string
|
||||
GetProvincesByCondition string
|
||||
GetDistrictByCondition string
|
||||
GetDistrictsByCondition string
|
||||
GetWardByCondition string
|
||||
GetWardsByCondition string
|
||||
CountProvinceByCondition string
|
||||
CountDistrictByCondition string
|
||||
CountWardByCondition string
|
||||
ProvinceDistinctWithField string
|
||||
}{
|
||||
GetLocationByCode: getLocationValue("get_location_warehouse"),
|
||||
GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
|
||||
GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
|
||||
GetWardsByCodes: getLocationValue("get_wards_by_codes"),
|
||||
GetLocationByCode: getLocationValue("get_location_warehouse"),
|
||||
GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
|
||||
GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
|
||||
GetWardsByCodes: getLocationValue("get_wards_by_codes"),
|
||||
GetProvinceByCondition: getLocationValue("get_province_by_condition"),
|
||||
GetProvincesByCondition: getLocationValue("get_provinces_by_condition"),
|
||||
GetDistrictByCondition: getLocationValue("get_district_by_condition"),
|
||||
GetDistrictsByCondition: getLocationValue("get_districts_byCondition"),
|
||||
GetWardByCondition: getLocationValue("get_ward_by_condition"),
|
||||
GetWardsByCondition: getLocationValue("get_wards_by_condition"),
|
||||
CountProvinceByCondition: getLocationValue("count_province_by_condition"),
|
||||
CountDistrictByCondition: getLocationValue("count_district_by_condition"),
|
||||
CountWardByCondition: getLocationValue("count_ward_by_condition"),
|
||||
ProvinceDistinctWithField: getLocationValue("province_distinct_with_field"),
|
||||
}
|
||||
|
|
|
@ -12,10 +12,12 @@ var Order = struct {
|
|||
ChangeDeliveryStatus string
|
||||
UpdateLogisticInfoFailed string
|
||||
ORNotUpdateStatus string
|
||||
GetSupplierOrders string
|
||||
}{
|
||||
UpdateORStatus: getOrderValue("update_outbound_request_status"),
|
||||
CancelDelivery: getOrderValue("cancel_delivery"),
|
||||
ChangeDeliveryStatus: getOrderValue("change_delivery_status"),
|
||||
UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
|
||||
ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"),
|
||||
GetSupplierOrders: getOrderValue("get_supplier_orders"),
|
||||
}
|
||||
|
|
|
@ -10,8 +10,10 @@ var Supplier = struct {
|
|||
GetListSupplierInfo string
|
||||
GetSupplierContractBySupplierID string
|
||||
FindAll string
|
||||
GetListWarehouseFreeship string
|
||||
}{
|
||||
GetListSupplierInfo: getSupplierValue("get_list_supplier_info"),
|
||||
GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
|
||||
FindAll: getSupplierValue("find_all"),
|
||||
GetListWarehouseFreeship: getSupplierValue("get_list_warehouse_freeship"),
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ func getWarehouseValue(val string) string {
|
|||
}
|
||||
|
||||
var Warehouse = struct {
|
||||
WebhookOnPoint string
|
||||
CreateWarehouseIntoServiceSupplier string
|
||||
UpdateWarehouseIntoServiceSupplier string
|
||||
CreateOutboundRequest string
|
||||
|
@ -36,6 +37,7 @@ var Warehouse = struct {
|
|||
SyncORStatus: getWarehouseValue("sync_or_status"),
|
||||
WebhookTNC: getWarehouseValue("webhook_tnc"),
|
||||
WebhookGlobalCare: getWarehouseValue("webhook_global_care"),
|
||||
WebhookOnPoint: getWarehouseValue("webhook_on_point"),
|
||||
FindOne: getWarehouseValue("find_one"),
|
||||
FindByCondition: getWarehouseValue("find_all_by_condition"),
|
||||
Distinct: getWarehouseValue("distinct"),
|
||||
|
|
Loading…
Reference in New Issue