fix get bank info

Reviewed-on: #48

client/authsms.go

@@ -0,0 +1,60 @@
+package client
+
+import (
+	"encoding/json"
+	"errors"
+	"git.selly.red/Selly-Modules/natsio"
+	"git.selly.red/Selly-Modules/natsio/model"
+	"git.selly.red/Selly-Modules/natsio/subject"
+	"go.mongodb.org/mongo-driver/bson"
+)
+
+// AuthSMS ...
+type AuthSMS struct{}
+
+// GetAutSMS ...
+func GetAutSMS() AuthSMS {
+	return AuthSMS{}
+}
+
+func (s AuthSMS) CreateUserSMSViaAuthSMS(p model.CreateUserSMSRequest) (*model.CreateUserSMSResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.AuthSMS.CreateUserSMS, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.CreateUserSMSResponse `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
+}
+
+func (s AuthSMS) GetListPermission() (*model.GetListPermissionResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.AuthSMS.GetListPermission, toBytes(bson.M{}))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.GetListPermissionResponse `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
+}

client/bank.go

@@ -17,15 +17,16 @@ func GetBank() Bank {
 	return Bank{}
 }
 
-func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
+// GetBankInfo ...
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID))
+func (s Bank) GetBankInfo(p []model.GetBankInfoRequest) ([]*model.ResponseBankInfo, error) {
+	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfo, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  *model.BankBrief `json:"data"`
+		Data  []*model.ResponseBankInfo `json:"data"`
-		Error string           `json:"error"`
+		Error string                    `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
@@ -38,7 +39,7 @@ func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
 	return r.Data, nil
 }
 
-func (s Bank) CheckBankAndBranchByID(p model.BankBranchRequest) bool {
+func (s Bank) CheckBankAndBranchByID(p model.CheckBankAndBranchByIDRequest) bool {
 	msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p))
 	if err != nil {
 		return false

client/bank_branch.go

@@ -1,39 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// BankBranch ...
-type BankBranch struct{}
-
-// GetBankBranch ...
-func GetBankBranch() BankBranch {
-	return BankBranch{}
-}
-
-func (s BankBranch) GetBankBranchById(bankBranchID string) (*model.BankBranchBrief, error) {
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankBranchById, toBytes(bankBranchID))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.BankBranchBrief `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
-}

client/location.go

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

client/order.go

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

client/seller.go

@@ -79,7 +79,6 @@ func (s Seller) GetListSellerInfoSupportChatByIDs(p model.GetListSellerSupportCh
 	if err := json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}
-
 	if r.Error != "" {
 		return nil, errors.New(r.Error)
 

client/supplier.go

@@ -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,44 @@ func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWareh
 	}
 	return nil
 }
+
+// GetWarehouseFreeship ...
+func (s Supplier) GetWarehouseFreeship() (*model.ResponseListWarehouseIDByBusinessType, error) {
+	msg, err := natsio.GetServer().Request(subject.Selly.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
+}
+
+// GetFreeshipsBySupplierIDs ...
+func (s Supplier) GetFreeshipsBySupplierIDs(p model.GetFreeshipsBySupplierIds) (*model.ResponseListFreeshipsBySupplierIds, error) {
+	msg, err := natsio.GetServer().Request(subject.Selly.GetFreeshipsBySupplierIds, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var r struct {
+		Data  *model.ResponseListFreeshipsBySupplierIds `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
+}

client/warehouse.go

@@ -3,6 +3,7 @@ package client
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 
 	"git.selly.red/Selly-Modules/natsio"
 	"git.selly.red/Selly-Modules/natsio/model"
@@ -163,3 +164,21 @@ func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWareho
 	}
 	return r.Data, nil
 }
+
+// UpdateORDeliveryStatus ...
+func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatus) error {
+	msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, 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_or_delivery_status %v", err)
+	}
+	if r.Error != "" {
+		return errors.New(r.Error)
+	}
+	return nil
+}

json_encoder.go

@@ -22,6 +22,17 @@ func (e JSONEncoder) Subscribe(subject string, cb nats.Handler) (*nats.Subscript
 	return sub, err
 }
 
+// QueueSubscribe ...
+func (e JSONEncoder) QueueSubscribe(subject, queue string, cb nats.Handler) (*nats.Subscription, error) {
+	sub, err := e.encConn.QueueSubscribe(subject, queue, cb)
+	if err != nil {
+		log.Printf("natsio.JSONEncoder.QueueSubscribe err: %v\n", err)
+	} else {
+		log.Printf("natsio.JSONEncoder.QueueSubscribe - subscribed to subject %s successfully\n", subject)
+	}
+	return sub, err
+}
+
 // Publish ...
 func (e JSONEncoder) Publish(reply string, data interface{}) error {
 	return e.encConn.Publish(reply, data)

model/authsms_request.go

@@ -0,0 +1,10 @@
+package model
+
+type CreateUserSMSRequest struct {
+	Name     string `json:"name"`
+	Phone    string `json:"phone"`
+	Email    string `json:"email"`
+	Supplier string `json:"supplier"`
+	Role     string `json:"role"`
+	Password string `json:"password"`
+}

model/authsms_response.go

@@ -0,0 +1,9 @@
+package model
+
+type CreateUserSMSResponse struct {
+	ID string `json:"_id"`
+}
+
+type GetListPermissionResponse struct {
+	Permission []string `json:"permission"`
+}

model/bank_branch_reponse.go

@@ -1,11 +0,0 @@
-package model
-
-// BankBranchBrief ...
-type BankBranchBrief struct {
-	ID       string `json:"_id"`
-	City     string `json:"city"`
-	BankCode string `json:"bankCode"`
-	Bank     string `json:"bank"`
-	Active   bool   `json:"active"`
-	Name     string `json:"name"`
-}

model/bank_branch_request.go

@@ -1,6 +0,0 @@
-package model
-
-type BankBranchRequest struct {
-	BankID   string `json:"bankId"`
-	BranchID string `json:"branchId"`
-}

model/bank_request.go

@@ -0,0 +1,11 @@
+package model
+
+type CheckBankAndBranchByIDRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
+}
+
+type GetBankInfoRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
+}

model/bank_response.go

@@ -1,21 +1,40 @@
 package model
 
+import "time"
+
 // MultiLang ...
 type MultiLang struct {
 	En string `json:"en"`
 	Vi string `json:"vi"`
 }
 
+// BankBranchBrief ...
+type BranchBrief struct {
+	ID       string `json:"_id"`
+	City     string `json:"city"`
+	BankCode string `json:"bankCode"`
+	BankID   string `json:"bankId"`
+	Active   bool   `json:"active"`
+	Name     string `json:"name"`
+}
+
 // BankBrief ...
 type BankBrief struct {
-	ID                       string    `json:"_id"`
+	ID                       string      `json:"_id"`
-	Name                     MultiLang `json:"name"`
+	Name                     MultiLang   `json:"name"`
-	ShortName                string    `json:"shortName"`
+	ShortName                string      `json:"shortName"`
-	Active                   bool      `json:"active"`
+	Active                   bool        `json:"active"`
-	BenBankName              string    `json:"benBankName"`
+	BenBankName              string      `json:"benBankName"`
-	BankCode                 int       `json:"bankCode"`
+	BankCode                 int         `json:"bankCode"`
-	IsBranchRequired         bool      `json:"isBranchRequired"`
+	IsBranchRequired         bool        `json:"isBranchRequired"`
-	SearchString             string    `json:"searchString"`
+	BeneficiaryForVietinbank string      `json:"beneficiaryForVietinbank"`
-	BeneficiaryForVietinbank string    `json:"beneficiaryForVietinbank"`
+	CreatedBy                string      `json:"createdBy,omitempty"`
-	CreatedBy                string    `json:"createdBy,omitempty"`
+	CreatedAt                time.Time   `json:"createdAt"`
+	BranchTotal              int64       `json:"branchTotal"`
+	Logo                     interface{} `json:"logo"`
+}
+
+type ResponseBankInfo struct {
+	Bank   BankBrief   `json:"bank"`
+	Branch BranchBrief `json:"branch"`
 }

model/location_request.go

@@ -1,23 +1,65 @@
 package model
 
 // LocationRequestPayload ...
-type LocationRequestPayload struct {
+type (
-	Province int `json:"province"`
+	LocationRequestPayload struct {
-	District int `json:"district"`
+		Province int `json:"province"`
-	Ward     int `json:"ward"`
+		District int `json:"district"`
-}
+		Ward     int `json:"ward"`
+	}
 
-// ProvinceRequestPayload ...
+	// ProvinceRequestPayload ...
-type ProvinceRequestPayload struct {
+	ProvinceRequestPayload struct {
-	Codes []int `json:"codes"`
+		Codes []int `json:"codes"`
-}
+	}
 
-// DistrictRequestPayload ...
+	// ProvinceRequestCondition ...
-type DistrictRequestPayload struct {
+	ProvinceRequestCondition struct {
-	Codes []int `json:"codes"`
+		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 ...
+	// DistrictRequestPayload ...
-type WardRequestPayload struct {
+	DistrictRequestPayload struct {
-	Codes []int `json:"codes"`
+		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"`
+	}
+)

model/location_response.go

@@ -1,43 +1,96 @@
 package model
 
-type ResponseLocationAddress struct {
+import "time"
-	Province LocationProvince `json:"province"`
-	District LocationDistrict `json:"district"`
-	Ward     LocationWard     `json:"ward"`
-}
 
-// LocationProvince ...
+type (
-type LocationProvince struct {
+	// ResponseLocationAddress ...
-	ID   string `json:"id"`
+	ResponseLocationAddress struct {
-	Name string `json:"name"`
+		Province LocationProvince `json:"province"`
-	Code int    `json:"code"`
+		District LocationDistrict `json:"district"`
-}
+		Ward     LocationWard     `json:"ward"`
+	}
 
-// LocationDistrict ...
+	// LocationProvince ...
-type LocationDistrict struct {
+	LocationProvince struct {
-	ID   string `json:"id"`
+		ID             string `json:"id"`
-	Name string `json:"name"`
+		Name           string `json:"name"`
-	Code int    `json:"code"`
+		Code           int    `json:"code"`
-}
+		RegionCode     string `json:"regionCode"`
+		MainRegionCode string `json:"mainRegionCode"`
+	}
 
-// LocationWard ...
+	// LocationDistrict ...
-type LocationWard struct {
+	LocationDistrict struct {
-	ID   string `json:"id"`
+		ID   string `json:"id"`
-	Name string `json:"name"`
+		Name string `json:"name"`
-	Code int    `json:"code"`
+		Code int    `json:"code"`
-}
+	}
 
-// LocationProvinceResponse ...
+	// LocationWard ...
-type LocationProvinceResponse struct {
+	LocationWard struct {
-	Provinces []LocationProvince `json:"provinces"`
+		ID   string `json:"id"`
-}
+		Name string `json:"name"`
+		Code int    `json:"code"`
+	}
 
-// LocationDistrictResponse ...
+	// LocationProvinceResponse ...
-type LocationDistrictResponse struct {
+	LocationProvinceResponse struct {
-	Districts []LocationDistrict `json:"districts"`
+		Provinces []LocationProvince `json:"provinces"`
-}
+	}
 
-// LocationWardResponse ...
+	// LocationDistrictResponse ...
-type LocationWardResponse struct {
+	LocationDistrictResponse struct {
-	Wards []LocationWard `json:"wards"`
+		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"`
+	}
+)

model/order_request.go

@@ -2,6 +2,7 @@ package model
 
 // OrderUpdateORStatus ...
 type OrderUpdateORStatus struct {
+	ID             string      `json:"id"`
 	OrderCode      string      `json:"orderCode"`
 	ORCode         string      `json:"orCode"`
 	Status         string      `json:"status"`
@@ -38,3 +39,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"`
+}

model/order_response.go

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

model/seller_response.go

@@ -21,16 +21,25 @@ type ResponseListSellerInfoSupportChat struct {
 
 // ResponseSellerInfoSupportChat ...
 type ResponseSellerInfoSupportChat struct {
-	ID           string               `json:"_id"`
+	ID           string                 `json:"_id"`
-	Name         string               `json:"name"`
+	Name         string                 `json:"name"`
-	Code         string               `json:"code"`
+	Code         string                 `json:"code"`
-	Membership   SellerMembershipInfo `json:"membership"`
+	Membership   SellerMembershipInfo   `json:"membership"`
-	Info         SellerContactInfo    `json:"info"`
+	Info         SellerContactInfo      `json:"info"`
-	Team         *TeamInfo            `json:"team,omitempty"`
+	Team         *TeamInfo              `json:"team,omitempty"`
-	Statistic    SellerStatistic      `json:"statistic"`
+	Statistic    SellerStatistic        `json:"statistic"`
-	TrackingTime *SellerTrackingTime  `json:"trackingTime"`
+	TrackingTime *SellerTrackingTime    `json:"trackingTime"`
-	Invitee      *InviteeInfo         `json:"invitee"`
+	Invitee      *InviteeInfo           `json:"invitee"`
-	CreatedAt    time.Time            `json:"createdAt"`
+	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 ...

model/supplier_request.go

@@ -38,3 +38,7 @@ type UpdateSupplierWarehousePayload struct {
 	DistrictCode int    `json:"districtCode"`
 	WardCode     int    `json:"wardCode"`
 }
+
+type GetFreeshipsBySupplierIds struct {
+	SupplierIDs []string `json:"supplierIds"`
+}

model/supplier_response.go

@@ -29,3 +29,18 @@ type SupplierAll struct {
 	Suppliers []SupplierBrief `json:"suppliers"`
 	Total     int64           `json:"total"`
 }
+
+type ResponseListWarehouseIDByBusinessType struct {
+	Warehouses []string `json:"warehouses"`
+}
+
+type Freeship struct {
+	ID            string   `json:"_id"`
+	ShortName     string   `json:"shortName"`
+	MilestoneText []string `json:"milestoneText"`
+}
+
+type ResponseListFreeshipsBySupplierIds struct {
+	SupplierID string     `json:"supplierId"`
+	Freeships  []Freeship `json:"freeships"`
+}

model/warehouse_request.go

@@ -2,17 +2,18 @@ package model
 
 // OutboundRequestPayload ...
 type OutboundRequestPayload struct {
-	OrderID      string                `json:"orderId"`
+	OrderID       string                `json:"orderId"`
-	OrderCode    string                `json:"orderCode"`
+	OrderCode     string                `json:"orderCode"`
-	TrackingCode string                `json:"trackingCode"`
+	TrackingCode  string                `json:"trackingCode"`
-	WarehouseID  string                `json:"warehouseId"`
+	WarehouseID   string                `json:"warehouseId"`
-	SupplierID   string                `json:"supplierId"`
+	SupplierID    string                `json:"supplierId"`
-	Note         string                `json:"note"`
+	Note          string                `json:"note"`
-	CODAmount    float64               `json:"codAmount"`
+	CODAmount     float64               `json:"codAmount"`
-	TPLCode      string                `json:"tplCode"`
+	TPLCode       string                `json:"tplCode"`
-	Customer     CustomerInfo          `json:"customer"`
+	Customer      CustomerInfo          `json:"customer"`
-	Items        []OutboundRequestItem `json:"items"`
+	Items         []OutboundRequestItem `json:"items"`
-	Insurance    *InsuranceOpts        `json:"insurance"`
+	Insurance     *InsuranceOpts        `json:"insurance"`
+	PaymentMethod string                `json:"paymentMethod"`
 }
 
 // InsuranceOpts ...
@@ -36,9 +37,11 @@ type InsuranceOpts struct {
 
 // OutboundRequestItem ...
 type OutboundRequestItem struct {
-	SupplierSKU string `json:"supplierSKU"`
+	SupplierSKU string  `json:"supplierSKU"`
-	Quantity    int64  `json:"quantity"`
+	Quantity    int64   `json:"quantity"`
-	UnitCode    string `json:"unitCode"`
+	UnitCode    string  `json:"unitCode"`
+	Price       float64 `json:"price"`
+	Name        string  `json:"name"`
 }
 
 // CustomerInfo ...
@@ -63,18 +66,22 @@ type UpdateOutboundRequestLogisticInfoPayload struct {
 	ShippingLabel string `json:"shippingLabel"`
 	TrackingCode  string `json:"trackingCode"`
 	ORCode        string `json:"orCode"`
+	TPLCode       string `json:"tplCode"`
+	OrderID       string `json:"orderId"`
 }
 
 // CancelOutboundRequest ...
 type CancelOutboundRequest struct {
-	ORCode string `json:"orCode"`
+	ORCode  string `json:"orCode"`
-	Note   string `json:"note"`
+	OrderID string `json:"orderId"`
+	Note    string `json:"note"`
 }
 
 // SyncORStatusRequest ...
 type SyncORStatusRequest struct {
 	ORCode    string `json:"orCode"`
 	OrderCode string `json:"orderCode"`
+	OrderID   string `json:"orderId"`
 }
 
 // UpdateSupplierIsClosedRequest ...
@@ -98,3 +105,11 @@ type GetWarehousesRequest struct {
 	Page  int64 `json:"page"`
 	Limit int64 `json:"limit"`
 }
+
+// WarehouseORUpdateDeliveryStatus ...
+type WarehouseORUpdateDeliveryStatus struct {
+	ORCode         string `json:"orCode"`
+	OrderCode      string `json:"orderCode"`
+	OrderID        string `json:"orderId"`
+	DeliveryStatus string `json:"deliveryStatus"`
+}

subject/authsms.go

@@ -0,0 +1,15 @@
+package subject
+
+import "fmt"
+
+func getAuthSMSValue(val string) string {
+	return fmt.Sprintf("%s.%s", prefixes.AuthSMS, val)
+}
+
+var AuthSMS = struct {
+	CreateUserSMS     string
+	GetListPermission string
+}{
+	CreateUserSMS:     getAuthSMSValue("create_user_sms"),
+	GetListPermission: getAuthSMSValue("get_list_permission"),
+}

subject/bank.go

@@ -7,11 +7,9 @@ func getBankValue(val string) string {
 }
 
 var Bank = struct {
-	GetBankById            string
+	GetBankInfo            string
-	GetBankBranchById      string
 	CheckBankAndBranchByID string
 }{
-	GetBankById:            getBankValue("get_bank_by_id"),
+	GetBankInfo:            getBankValue("get_bank_info"),
-	GetBankBranchById:      getBankValue("get_bank_branch_by_id"),
+	CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
-	CheckBankAndBranchByID: getBankValue("check_bank_and_brach_by_id"),
 }

subject/config.go

@@ -9,6 +9,8 @@ var prefixes = struct {
 	Bank          string
 	Supplier      string
 	Seller        string
+	AuthSMS       string
+	Selly         string
 }{
 	Communication: "communication",
 	Order:         "order",
@@ -18,4 +20,6 @@ var prefixes = struct {
 	Supplier:      "supplier",
 	Bank:          "bank",
 	Seller:        "seller",
+	AuthSMS:       "auth_sms",
+	Selly:         "selly",
 }

subject/location.go

@@ -7,13 +7,33 @@ func getLocationValue(val string) string {
 }
 
 var Location = struct {
-	GetLocationByCode   string
+	GetLocationByCode         string
-	GetProvincesByCodes string
+	GetProvincesByCodes       string
-	GetDistrictsByCodes string
+	GetDistrictsByCodes       string
-	GetWardsByCodes     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"),
+	GetLocationByCode:         getLocationValue("get_location_warehouse"),
-	GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
+	GetProvincesByCodes:       getLocationValue("get_provinces_by_codes"),
-	GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
+	GetDistrictsByCodes:       getLocationValue("get_districts_by_codes"),
-	GetWardsByCodes:     getLocationValue("get_wards_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"),
 }

subject/order.go

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

subject/selly.go

@@ -0,0 +1,15 @@
+package subject
+
+import "fmt"
+
+func getSellyValue(val string) string {
+	return fmt.Sprintf("%s.%s", prefixes.Selly, val)
+}
+
+var Selly = struct {
+	GetFreeshipsBySupplierIds string
+	GetListWarehouseFreeship  string
+}{
+	GetFreeshipsBySupplierIds: getSellyValue("get_freeships_by_supplier_ids"),
+	GetListWarehouseFreeship:  getSupplierValue("get_list_warehouse_freeship"),
+}

subject/warehouse.go

@@ -9,37 +9,41 @@ func getWarehouseValue(val string) string {
 var Warehouse = struct {
 	CreateWarehouseIntoServiceSupplier string
 	UpdateWarehouseIntoServiceSupplier string
-	CreateOutboundRequest         string
+	CreateOutboundRequest              string
-	UpdateOutboundRequestLogistic string
+	UpdateOutboundRequestLogistic      string
-	CancelOutboundRequest         string
+	CancelOutboundRequest              string
-	GetConfiguration              string
+	GetConfiguration                   string
-	SyncORStatus                  string
+	SyncORStatus                       string
-	WebhookTNC                    string
+	WebhookTNC                         string
-	WebhookGlobalCare             string
+	WebhookGlobalCare                  string
-	FindOne                       string
+	WebhookOnPoint                     string
-	FindByCondition               string
+	FindOne                            string
-	Distinct                      string
+	FindByCondition                    string
-	Count                         string
+	Distinct                           string
-	AfterUpdateWarehouse          string
+	Count                              string
-	AfterCreateWarehouse          string
+	AfterUpdateWarehouse               string
-	UpdateIsClosedSupplier        string
+	AfterCreateWarehouse               string
-	GetWarehouses                 string
+	UpdateIsClosedSupplier             string
+	GetWarehouses                      string
+	UpdateORDeliveryStatus             string
 }{
 	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
-	AfterCreateWarehouse:          getWarehouseValue("after_create_warehouse"),
+	AfterCreateWarehouse:               getWarehouseValue("after_create_warehouse"),
-	AfterUpdateWarehouse:          getWarehouseValue("after_update_warehouse"),
+	AfterUpdateWarehouse:               getWarehouseValue("after_update_warehouse"),
-	CreateOutboundRequest:         getWarehouseValue("create_outbound_request"),
+	CreateOutboundRequest:              getWarehouseValue("create_outbound_request"),
-	UpdateOutboundRequestLogistic: getWarehouseValue("update_outbound_request_logistic_info"),
+	UpdateOutboundRequestLogistic:      getWarehouseValue("update_outbound_request_logistic_info"),
-	CancelOutboundRequest:         getWarehouseValue("cancel_outbound_request"),
+	CancelOutboundRequest:              getWarehouseValue("cancel_outbound_request"),
-	GetConfiguration:              getWarehouseValue("get_configuration"),
+	GetConfiguration:                   getWarehouseValue("get_configuration"),
-	SyncORStatus:                  getWarehouseValue("sync_or_status"),
+	SyncORStatus:                       getWarehouseValue("sync_or_status"),
-	WebhookTNC:                    getWarehouseValue("webhook_tnc"),
+	WebhookTNC:                         getWarehouseValue("webhook_tnc"),
-	WebhookGlobalCare:             getWarehouseValue("webhook_global_care"),
+	WebhookGlobalCare:                  getWarehouseValue("webhook_global_care"),
-	FindOne:                       getWarehouseValue("find_one"),
+	WebhookOnPoint:                     getWarehouseValue("webhook_on_point"),
-	FindByCondition:               getWarehouseValue("find_all_by_condition"),
+	FindOne:                            getWarehouseValue("find_one"),
-	Distinct:                      getWarehouseValue("distinct"),
+	FindByCondition:                    getWarehouseValue("find_all_by_condition"),
-	Count:                         getWarehouseValue("count"),
+	Distinct:                           getWarehouseValue("distinct"),
-	UpdateIsClosedSupplier:        getWarehouseValue("update_is_closed_supplier"),
+	Count:                              getWarehouseValue("count"),
-	GetWarehouses:                 getWarehouseValue("get_warehouses"),
+	UpdateIsClosedSupplier:             getWarehouseValue("update_is_closed_supplier"),
+	GetWarehouses:                      getWarehouseValue("get_warehouses"),
+	UpdateORDeliveryStatus:             getWarehouseValue("update_or_delivery_status"),
 }