fix get supplier free ship info

Reviewed-on: #48

client/affiliate.go

@@ -1,36 +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"
-)
-
-// Affiliate ...
-type Affiliate struct{}
-
-// GetAffiliate ...
-func GetAffiliate() Affiliate {
-	return Affiliate{}
-}
-
-// GetTransactions ...
-func (w Affiliate) GetTransactions(p model.GetTransactionsRequest) (*model.GetTransactionsResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Affiliate.GetTransactions, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  *model.GetTransactionsResponse `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,14 +17,15 @@ 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"`
 	}
 
@@ -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/campaign.go

@@ -1,58 +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"
-)
-
-// Campaign ...
-type Campaign struct{}
-
-// GetCampaign ...
-func GetCampaign() Campaign {
-	return Campaign{}
-}
-
-// GetCampaignTransaction ...
-func (c Campaign) GetCampaignTransaction(p model.GetCampaignTransactionsRequest) (*model.ResponseCampaignTransactionAll, error) {
-	msg, err := natsio.GetServer().Request(subject.Campaign.GetListCampaignTransactionAdminInfoByIDs, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  *model.ResponseCampaignTransactionAll `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
-}
-
-// GetCampaignSellerStatistic ....
-func (c Campaign) GetCampaignSellerStatistic(req model.GetCampaignSellerStatisticBySellerIDs) (*model.ResponseCampaignSellerStatisticList, error) {
-	msg, err := natsio.GetServer().Request(subject.Campaign.GetCampaignSellerStatisticBySellerIDs, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseCampaignSellerStatisticList `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

@@ -19,28 +19,7 @@ func GetLocation() Location {
 
 // GetLocationByCode ...
 func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*model.ResponseLocationAddress, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCodeFromLocationService, toBytes(payload))
+	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCode, toBytes(payload))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseLocationAddress `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
-}
-
-// GetLocationByWardCode ...
-func (l Location) GetLocationByWardCode(payload model.RequestCondition) (*model.ResponseLocationAddress, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByWardCode, toBytes(payload))
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +40,7 @@ func (l Location) GetLocationByWardCode(payload model.RequestCondition) (*model.
 
 // GetProvincesByCodes ...
 func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +62,7 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo
 
 // GetDistrictsByCodes ...
 func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.LocationDistrictResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -105,7 +84,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
 
 // GetWardsByCodes ...
 func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWardResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}

client/order.go

@@ -119,22 +119,3 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
 	}
 	return &r.Data, nil
 }
-
-// GetUserTotalWarningOrder ...
-func (o Order) GetUserTotalWarningOrder(p model.OrderGetTotalWarningPayload) (*model.OrderGetTotalWarningRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Order.GetUserTotalWarningOrders, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  model.OrderGetTotalWarningRes `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/product.go

@@ -1,86 +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"
-)
-
-// Product ...
-type Product struct{}
-
-// GetProduct ...
-func GetProduct() Product {
-	return Product{}
-}
-
-func (c Product) ApplyRequest(p model.ProductApplyRequestPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.ApplyRequest, 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
-}
-
-func (c Product) CreateRequestSteps(p model.ProductCreateStepsPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.CreateRequestStep, 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
-}
-
-func (c Product) ProcessApplyRequest(p model.ProductApplyRequestPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.ProcessApplyRequest, 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
-}
-
-func (c Product) RequestChangeStatus(p model.ProductRequestChangeStatus) error {
-	msg, err := natsio.GetServer().Request(subject.Product.RequestChangeStatus, 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
-}

client/queue.go

@@ -1,35 +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"
-)
-
-// Queue ...
-type Queue struct{}
-
-// GetQueue ...
-func GetQueue() Queue {
-	return Queue{}
-}
-
-func (c Queue) ScheduleTask(p model.QueueScheduleTaskRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Queue.ScheduleTask, 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
-}

client/segmnet.go

@@ -1,41 +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"
-)
-
-// Segment ...
-type Segment struct{}
-
-// GetSegment ...
-func GetSegment() Segment {
-	return Segment{}
-}
-
-// GetListSegmentInfoByIds ...
-func (s Segment) GetListSegmentInfoByIds(p model.GetListSegmentRequest) (*model.ResponseListSegmentInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Segment.GetListSegmentInfo, toBytes(p))
-
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseListSegmentInfo `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/social_post.go

@@ -1,65 +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"
-)
-
-// SocialPost ...
-type SocialPost struct{}
-
-// GetSocialPost ...
-func GetSocialPost() SocialPost {
-	return SocialPost{}
-}
-
-// GetListSocialPostAppInfoByIDs ...
-func (s SocialPost) GetListSocialPostAppInfoByIDs(p model.GetListSocialPostAppByIDsRequest) (*model.ResponseListSocialPostAppInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.SocialPost.GetListSocialPostAppInfoByIDs, toBytes(p))
-
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseListSocialPostAppInfo `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
-}
-
-// GetBriefDetailSocialPostAdminByIDsRequest ...
-func (s SocialPost) GetBriefDetailSocialPostAdminByIDsRequest(p model.GetBriefInfoSocialPostAdminByIDsRequest) (*model.ResponseListSocialPostAdminInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.SocialPost.GetBriefInfoSocialPostAdminByIDs, toBytes(p))
-
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseListSocialPostAdminInfo `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/socket.go

@@ -1,27 +0,0 @@
-package client
-
-import (
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// Socket ...
-type Socket struct{}
-
-// GetSocket ...
-func GetSocket() Socket {
-	return Socket{}
-}
-
-// EmitSocketEventDataReward ...
-func (s Socket) EmitSocketEventDataReward(p model.PayloadEmitSocketEvent) error {
-	_, err := natsio.GetServer().Request(subject.Socket.EmitEventReward, toBytes(p))
-	return err
-}
-
-// EmitEventToUser ...
-func (s Socket) EmitEventToUser(p model.PayloadEmitSocketEvent) error {
-	_, err := natsio.GetServer().Request(subject.Socket.EmitEventToUser, toBytes(p))
-	return err
-}

client/staff.go

@@ -1,41 +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"
-)
-
-// Staff ...
-type Staff struct{}
-
-func GetStaff() Staff {
-	return Staff{}
-}
-
-// GetListStaffInfoByIds ...
-func (s Staff) GetListStaffInfoByIds(p model.GetListStaffRequest) (*model.ResponseListStaffInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Staff.GetListStaffInfo, toBytes(p))
-
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseListStaffInfo `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/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"
@@ -38,28 +39,6 @@ func (s Supplier) GetListSupplierInfo(p model.GetSupplierRequest) ([]*model.Resp
 	return r.Data, nil
 }
 
-// GetDetailSupplierInfo ...
-func (s Supplier) GetDetailSupplierInfo(p model.GetDetailSupplierRequest) (*model.ResponseSupplierInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.GetDetailSupplierInfo, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseSupplierInfo `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 Supplier) GetSupplierContractBySupplierID(p model.GetSupplierContractRequest) (*model.ResponseSupplierContract, error) {
 	msg, err := natsio.GetServer().Request(subject.Supplier.GetSupplierContractBySupplierID, toBytes(p))
 	if err != nil {
@@ -102,69 +81,6 @@ func (s Supplier) FindAll(supplierID model.SupplierRequestPayload) (*model.Suppl
 	return r.Data, nil
 }
 
-func (s Supplier) FindAllOld(req model.SupplierFindAllReq) (*model.SupplierAll, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.FindAllOld, toBytes(req))
-	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
-}
-
-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
-}
-
-func (s Supplier) Count(req model.SupplierCountReq) (*model.SupplierCountRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.Count, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.SupplierCountRes `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))
@@ -200,3 +116,63 @@ func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWareh
 	}
 	return nil
 }
+
+// GetListWarehouseFreeShip ...
+func (s Supplier) GetListWarehouseFreeShip() (*model.SupplierListWarehouseFreeShipResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.Supplier.GetListWarehouseFreeShip, toBytes(bson.M{}))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.SupplierListWarehouseFreeShipResponse `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
+}
+
+// GetFreeShipInfo ...
+func (s Supplier) GetFreeShipInfo(p model.SupplierFreeShipInfoRequestPayload) ([]*model.SupplierFreeShipInfoResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.Supplier.GetFreeShipInfo, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var r struct {
+		Data  []*model.SupplierFreeShipInfoResponse `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
+}
+
+// CreateCashflow ...
+func (s Supplier) CreateCashflow(p model.SupplierCashflowCreatePayload) (*model.SupplierCashflowCreateResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.Supplier.CreateCashflow, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var r struct {
+		Error string                                `json:"error"`
+		Data  *model.SupplierCashflowCreateResponse `json:"data"`
+	}
+	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/supplier_role.go

@@ -1,58 +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"
-)
-
-// SupplierRole ...
-type SupplierRole struct{}
-
-// GetSupplierRole ...
-func GetSupplierRole() SupplierRole {
-	return SupplierRole{}
-}
-
-func (s SupplierRole) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.CreateRoleResponse `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 SupplierRole) UpdateRole(p model.UpdateRoleRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierRole.Update, 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
-}

client/supplier_user.go

@@ -16,14 +16,14 @@ func GetSupplierUser() SupplierUser {
 	return SupplierUser{}
 }
 
-func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) {
+func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateSupplierOwnerUserRequest) (*model.CreateSupplierUserOwnerResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateSupplierOwnerUser, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  *model.CreateOwnerResponse `json:"data"`
+		Data  *model.CreateSupplierUserOwnerResponse `json:"data"`
 		Error string                                 `json:"error"`
 	}
 
@@ -37,8 +37,8 @@ func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*mod
 	return r.Data, nil
 }
 
-func (s SupplierUser) UpdateSupplierOwnerUsers(p model.UpdateOwnerRequest) error {
+func (s SupplierUser) UpdateSupplierOwnerUsers(p model.UpdateSupplierOwnerUserRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateOwner, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateSupplierOwnerUser, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -57,14 +57,14 @@ func (s SupplierUser) UpdateSupplierOwnerUsers(p model.UpdateOwnerRequest) error
 	return nil
 }
 
-func (s SupplierUser) CreateSupplierStaffUsers(p model.CreateStaffRequest) (*model.CreateStaffResponse, error) {
+func (s SupplierUser) CreateSupplierStaffUsers(p model.CreateSupplierStaffUserRequest) (*model.CreateSupplierUserStaffResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateStaff, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateSupplierStaffUser, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  *model.CreateStaffResponse `json:"data"`
+		Data  *model.CreateSupplierUserStaffResponse `json:"data"`
 		Error string                                 `json:"error"`
 	}
 
@@ -78,8 +78,8 @@ func (s SupplierUser) CreateSupplierStaffUsers(p model.CreateStaffRequest) (*mod
 	return r.Data, nil
 }
 
-func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error {
+func (s SupplierUser) UpdateSupplierStaffUsers(p model.CreateSupplierStaffUserRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateSupplierStaffUser, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -97,64 +97,3 @@ func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error
 
 	return nil
 }
-
-func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, 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
-}
-
-func (s SupplierUser) ResetPassword(p model.ResetPasswordRequest) (*model.ResetPasswordResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.ResetPassword, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResetPasswordResponse `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
-}
-
-// CheckTokenSupplierUser ...
-func (s SupplierUser) CheckTokenSupplierUser(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckTokenSupplierUser, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Error string                                `json:"error"`
-		Data  *model.ResponseCheckTokenSupplierUser `json:"data"`
-	}
-	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

@@ -146,25 +146,6 @@ func (w Warehouse) GetConfigByWarehouseID(warehouseID string) (*model.WarehouseC
 	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 ...
 func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWarehousesResponse, error) {
 	msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
@@ -186,7 +167,7 @@ func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWareho
 
 // UpdateORDeliveryStatus ...
 func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatus) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateORDeliveryStatus, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -201,43 +182,3 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
 	}
 	return nil
 }
-
-// UpdateStatusWarehousePendingInactive ...
-func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, 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_status_warehouse_pending_inactive %v", err)
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-	return nil
-}
-
-// UpdateIsSellyMall ...
-func (w Warehouse) UpdateIsSellyMall(p model.UpdateIsSellyMallRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateIsSellyMall, 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_is_selly_mall %v", err)
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-	return nil
-}

client/warehouse_dao.go

@@ -3,7 +3,6 @@ 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"
@@ -84,39 +83,3 @@ func (w Warehouse) FindByCondition(p model.FindWithCondition) ([]*model.Warehous
 	}
 	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
-}

js/consumer/selly.go

@@ -5,14 +5,8 @@ var Selly = struct {
 	PushNotification               string
 	UpdateSellerAffiliateStatistic string
 	CheckAnDInsertCashflowBySeller string
-	SubscriberTopic                     string
-	UpdateSellerSavingCampaignStatistic string
-	GenerateVoucherPromotion            string
 }{
 	PushNotification:               "PULL_PUSH_NOTIFICATION",
 	UpdateSellerAffiliateStatistic: "PULL_UPDATE_SELLER_AFFILIATE_STATISTIC",
 	CheckAnDInsertCashflowBySeller: "PULL_CHECK_AND_INSERT_CASHFLOW_BY_SELLER",
-	SubscriberTopic:                     "PULL_SUBSCRIBER_TOPIC",
-	UpdateSellerSavingCampaignStatistic: "PULL_UPDATE_SELLER_SAVING_CAMPAIGN_STATISTIC",
-	GenerateVoucherPromotion:            "PULL_GENERATE_VOUCHER_PROMOTION",
 }

js/model/selly.go

@@ -1,7 +1,5 @@
 package jsmodel
 
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
 // PushNotification ...
 type PushNotification struct {
 	User        string              `json:"user"`
@@ -16,9 +14,6 @@ type PushNotification struct {
 type NotificationOptions struct {
 	Title   string `json:"title"`
 	Content string `json:"content"`
-	CampaignID                 string `json:"campaignId,omitempty"`
-	SellerSavingCampaignID     string `json:"sellerSavingCampaignId,omitempty"`
-	SellerSavingCampaignStatus string `json:"sellerSavingCampaignStatus,omitempty"`
 }
 
 // PayloadUpdateSellerAffiliateStatistic ...
@@ -62,49 +57,4 @@ type CashFlowOptions struct {
 	AffiliateTransactionCode string `json:"affiliateTransactionCode,omitempty"`
 	AffiliateCampaignID      string `json:"affiliateCampaignId,omitempty"`
 	AffiliateCampaignName    string `json:"affiliateCampaignName,omitempty"`
-
-	// Campaign
-	CampaignID   string `json:"campaignId,omitempty"`
-	CampaignName string `json:"campaignName,omitempty"`
-
-	// SavingCampaign
-	SavingCampaignID   string `json:"savingCampaignId,omitempty"`
-	SavingCampaignName string `json:"savingCampaignName,omitempty"`
-
-	SavingCampaignItemID   string `json:"savingCampaignItemId,omitempty"`
-	SavingCampaignItemName string `json:"savingCampaignItemName,omitempty"`
-}
-
-// PayloadUpdateSellerSavingCampaignStatistic ...
-type PayloadUpdateSellerSavingCampaignStatistic struct {
-	SellerID  string                        `json:"sellerId"`
-	Statistic SellerSavingCampaignStatistic `json:"statistic"`
-}
-
-// SellerSavingCampaignStatistic ...
-type SellerSavingCampaignStatistic struct {
-	SavingCampaignCashPending   float64 `json:"savingCampaignCashPending"`
-	SavingCampaignCashCompleted float64 `json:"savingCampaignCashCompleted"`
-}
-
-// GenerateVoucherPromotion ...
-type GenerateVoucherPromotion struct {
-	Cash       float64                         `json:"cash"`
-	TargetID   primitive.ObjectID              `json:"targetId"`
-	TargetType string                          `json:"targetType"`
-	Options    GenerateVoucherPromotionOptions `json:"options"`
-	Seller     primitive.ObjectID              `json:"seller"`
-}
-
-// GenerateVoucherPromotionOptions ...
-type GenerateVoucherPromotionOptions struct {
-	Title string `json:"title"`
-}
-
-// SubscriberNotificationTopic ...
-type SubscriberNotificationTopic struct {
-	User     string `json:"user"`
-	Topic    string `json:"topic"`
-	DeviceId string `json:"deviceId"`
-	FCMToken string `json:"fcmToken"`
 }

js/subject/selly.go

@@ -14,14 +14,8 @@ var Selly = struct {
 	PushNotification               string
 	UpdateSellerAffiliateStatistic string
 	CheckAnDInsertCashflowBySeller string
-	SubscriberTopic                     string
-	UpdateSellerSavingCampaignStatistic string
-	GenerateVoucherPromotion            string
 }{
 	PushNotification:               getSellyValue("push_notifications"),
 	UpdateSellerAffiliateStatistic: getSellyValue("update_seller_affiliate_statistic"),
 	CheckAnDInsertCashflowBySeller: getSellyValue("check_and_insert_cashflow_statistic"),
-	SubscriberTopic:                     getSellyValue("subscriber_topic"),
-	UpdateSellerSavingCampaignStatistic: getSellyValue("update_seller_saving_campaign_statistic"),
-	GenerateVoucherPromotion:            getSellyValue("generate_voucher_promotion"),
 }

model/affiliate_request.go

@@ -1,16 +0,0 @@
-package model
-
-import "time"
-
-// GetTransactionsRequest ...
-type GetTransactionsRequest struct {
-	Page     int64     `json:"page"`
-	Limit    int64     `json:"limit"`
-	Keyword  string    `json:"keyword"`
-	Status   string    `json:"status"`
-	Source   string    `json:"source"`
-	Campaign string    `json:"campaign"`
-	Seller   string    `json:"seller"`
-	FromAt   time.Time `json:"fromAt"`
-	ToAt     time.Time `json:"toAt"`
-}

model/affiliate_response.go

@@ -1,38 +0,0 @@
-package model
-
-// GetTransactionsResponse ...
-type GetTransactionsResponse struct {
-	Total int64             `json:"total"`
-	Limit int64             `json:"limit"`
-	List  []TransactionInfo `json:"list"`
-}
-
-// TransactionInfo ...
-type TransactionInfo struct {
-	ID                       string                     `json:"_id"`
-	Code                     string                     `json:"code"`
-	Campaign                 ResponseCampaignShort      `json:"campaign"`
-	Seller                   ResponseSellerInfo         `json:"seller"`
-	Source                   string                     `json:"source"`
-	Commission               ResponseCampaignCommission `json:"commission"`
-	EstimateSellerCommission float64                    `json:"estimateSellerCommission"`
-	TransactionTime          string                     `json:"transactionTime"`
-	Status                   string                     `json:"status"`
-	RejectedReason           string                     `json:"rejectedReason"`
-	EstimateCashbackAt       string                     `json:"estimateCashbackAt"`
-}
-
-// ResponseCampaignCommission ...
-type ResponseCampaignCommission struct {
-	Real          float64 `json:"real"`
-	SellerPercent float64 `json:"sellerPercent"`
-	Selly         float64 `json:"selly"`
-	Seller        float64 `json:"seller"`
-}
-
-// ResponseCampaignShort ...
-type ResponseCampaignShort struct {
-	ID   string     `json:"_id"`
-	Name string     `json:"name"`
-	Logo *FilePhoto `json:"logo"`
-}

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,11 +1,23 @@
 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"`
@@ -15,7 +27,14 @@ type BankBrief struct {
 	BenBankName              string      `json:"benBankName"`
 	BankCode                 int         `json:"bankCode"`
 	IsBranchRequired         bool        `json:"isBranchRequired"`
-	SearchString             string    `json:"searchString"`
 	BeneficiaryForVietinbank string      `json:"beneficiaryForVietinbank"`
 	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/campaign_request.go

@@ -1,22 +0,0 @@
-package model
-
-import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"time"
-)
-
-// GetCampaignTransactionsRequest ...
-type GetCampaignTransactionsRequest struct {
-	Campaign string    `json:"campaign"`
-	Keyword  string    `json:"keyword"`
-	Status   string    `json:"status"`
-	FromAt   time.Time `json:"fromAt"`
-	ToAt     time.Time `json:"toAt"`
-	Page     int64     `json:"page"`
-	Limit    int64     `json:"limit"`
-}
-
-// GetCampaignSellerStatisticBySellerIDs ...
-type GetCampaignSellerStatisticBySellerIDs struct {
-	SellerIDs []primitive.ObjectID
-}

model/campaign_response.go

@@ -1,88 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-// ResponseCampaignTransactionAll ...
-type ResponseCampaignTransactionAll struct {
-	List  []ResponseNatsCampaignTransaction `json:"list"`
-	Total int64                             `json:"total"`
-	Limit int64                             `json:"limit"`
-}
-
-// ResponseNatsCampaignTransaction ...
-type ResponseNatsCampaignTransaction struct {
-	ID               string                                       `json:"_id"`
-	Cash             float64                                      `json:"cash"`
-	Campaign         ResponseCampaignShortInfo                    `json:"campaign"`
-	Options          ResponseCampaignTransactionOptions           `json:"options"`
-	Seller           primitive.ObjectID                           `json:"seller"`
-	Type             string                                       `json:"type"`
-	Status           string                                       `json:"status"`
-	RejectedReason   string                                       `json:"rejectedReason"`
-	CreatedAt        string                                       `json:"createdAt"`
-	UpdatedAt        string                                       `json:"updatedAt"`
-	Item             *ResponseCampaignItemShortInfo               `json:"item"`
-	ApprovedBy       primitive.ObjectID                           `json:"approvedBy,omitempty"`
-	RejectedBy       primitive.ObjectID                           `json:"rejectedBy,omitempty"`
-	ApprovedAt       string                                       `json:"approvedAt,omitempty"`
-	RejectedAt       string                                       `json:"rejectedAt,omitempty"`
-	CompletedAt      string                                       `json:"completedAt,omitempty"`
-	RejectReason     string                                       `json:"rejectReason,omitempty"`
-	AdminConfirmData *ResponseCampaignTransactionAdminConfirmData `json:"adminConfirmData,omitempty"`
-}
-
-// ResponseCampaignShortInfo ...
-type ResponseCampaignShortInfo struct {
-	ID     string `json:"_id"`
-	Name   string `json:"name"`
-	Status string `json:"status"`
-}
-
-// ResponseCampaignItemShortInfo ...
-type ResponseCampaignItemShortInfo struct {
-	ID     string `json:"_id"`
-	Name   string `json:"name"`
-	Status string `json:"status"`
-}
-
-// ResponseCampaignTransactionOptions ...
-type ResponseCampaignTransactionOptions struct {
-	Link           string `json:"link"`
-	SocialChannel  string `json:"socialChannel"`
-	Milestone      int64  `json:"milestone"`
-	MilestoneTitle string `json:"milestoneTitle"`
-}
-
-// ResponseCampaignTransactionAdminConfirmData ...
-type ResponseCampaignTransactionAdminConfirmData struct {
-	FriendPublicTotal int64 `json:"friendPublicTotal"`
-}
-
-// ResponseCampaignSellerStatisticList ...
-type ResponseCampaignSellerStatisticList struct {
-	List []ResponseCampaignSellerStatistic `json:"list"`
-}
-
-// ResponseCampaignSellerStatistic ...
-type ResponseCampaignSellerStatistic struct {
-	SellerID  primitive.ObjectID      `json:"sellerId"`
-	Statistic CampaignSellerStatistic `json:"Statistic"`
-}
-
-// CampaignSellerStatistic ...
-type CampaignSellerStatistic struct {
-	TotalNotRejected     int64   `bson:"totalNotRejected" json:"totalNotRejected"`
-	CashTotalNotRejected float64 `bson:"cashTotalNotRejected" json:"cashTotalNotRejected"`
-
-	TotalCompleted     int64   `bson:"totalCompleted" json:"totalCompleted"`
-	CashTotalCompleted float64 `bson:"cashTotalCompleted" json:"cashTotalCompleted"`
-
-	TotalPending     int64   `bson:"totalPending" json:"totalPending"`
-	CashTotalPending float64 `bson:"cashTotalPending" json:"cashTotalPending"`
-
-	TotalApproved     int64   `bson:"totalApproved" json:"totalApproved"`
-	CashTotalApproved float64 `bson:"cashTotalApproved" json:"cashTotalApproved"`
-
-	TotalRejected     int64   `bson:"totalRejected" json:"totalRejected"`
-	CashTotalRejected float64 `bson:"cashTotalRejected" json:"cashTotalRejected"`
-}

model/common_request.go

@@ -21,6 +21,12 @@ type ActionBy struct {
 	Name string `json:"name"`
 }
 
+// ClickAction ...
+type ClickAction struct {
+	Type  string `json:"type"`
+	Value string `json:"value"`
+}
+
 // RequestCondition ...
 type RequestCondition struct {
 	Code         int   `json:"code"`
@@ -29,28 +35,10 @@ type RequestCondition struct {
 	ProvinceCode int   `json:"provinceCode"`
 
 	Slug         string   `json:"slug"`
-	OldSlug string `json:"oldSlug"`
-
 	Slugs        []string `json:"slugs"`
-	OldSlugs []string `json:"oldSlugs"`
-
 	DistrictSlug string   `json:"districtSlug"`
 	ProvinceSlug string   `json:"provinceSlug"`
 
 	Keyword string `json:"keyword"`
 	Region  string `json:"region"`
-
-	Page  int64 `json:"page"`
-	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
 }

model/communication_request.go

@@ -5,9 +5,6 @@ type CommunicationRequestHttp struct {
 	ResponseImmediately bool        `json:"responseImmediately"`
 	Authentication      string      `json:"authentication"`
 	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 ...

model/file_response.go

@@ -1,56 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-// FilePhoto ...
-type FilePhoto struct {
-	ID         string          `json:"_id"`
-	Name       string          `json:"name,omitempty"`
-	Dimensions *FileDimensions `json:"dimensions"`
-}
-
-// FileSize ...
-type FileSize struct {
-	Width  int    `json:"width"`
-	Height int    `json:"height"`
-	URL    string `json:"url"`
-}
-
-// FileDimensions ...
-type FileDimensions struct {
-	Small  *FileSize `json:"sm"`
-	Medium *FileSize `json:"md"`
-}
-
-// ListPhoto ...
-type ListPhoto []*FilePhoto
-
-// Video ...
-type Video struct {
-	ID             primitive.ObjectID   `json:"_id"`
-	Name           string               `json:"name"`
-	Dimensions     *FileVideoDimensions `json:"dimensions"`
-	VideoExtension string               `json:"ext"`
-	Thumbnail      *FilePhoto           `json:"thumbnail"`
-	Status         string               `json:"status"`
-}
-
-// FileVideoDimensions ...
-type FileVideoDimensions struct {
-	Dimension480p     *FileVideoSize `json:"size480p"`
-	Dimension720p     *FileVideoSize `json:"size720p"`
-	Dimension1080p    *FileVideoSize `json:"size1080p"`
-	DimensionOriginal *FileVideoSize `json:"original"`
-}
-
-// FileVideoSize ...
-type FileVideoSize struct {
-	Name   string `json:"name"`
-	Width  int    `json:"width"`
-	Height int    `json:"height"`
-	Size   string `json:"size"`
-	URL    string `json:"url"`
-}
-
-// ListVideo ...
-type ListVideo []Video

model/location_request.go

@@ -2,7 +2,6 @@ package model
 
 // LocationRequestPayload ...
 type (
-	// LocationRequestPayload ...
 	LocationRequestPayload struct {
 		Province int `json:"province"`
 		District int `json:"district"`

model/location_response.go

@@ -1,5 +1,7 @@
 package model
 
+import "time"
+
 type (
 	// ResponseLocationAddress ...
 	ResponseLocationAddress struct {
@@ -13,7 +15,6 @@ type (
 		ID             string `json:"id"`
 		Name           string `json:"name"`
 		Code           int    `json:"code"`
-		Slug           string `json:"slug"`
 		RegionCode     string `json:"regionCode"`
 		MainRegionCode string `json:"mainRegionCode"`
 	}
@@ -23,7 +24,6 @@ type (
 		ID   string `json:"id"`
 		Name string `json:"name"`
 		Code int    `json:"code"`
-		Slug string `json:"slug"`
 	}
 
 	// LocationWard ...
@@ -31,14 +31,6 @@ type (
 		ID   string `json:"id"`
 		Name string `json:"name"`
 		Code int    `json:"code"`
-		Slug     string       `json:"slug"`
-		Location *GEOLocation `json:"location"`
-	}
-
-	// GEOLocation ...
-	GEOLocation struct {
-		Type        string    `bson:"type" json:"type"`
-		Coordinates []float64 `bson:"coordinates" json:"coordinates"`
 	}
 
 	// LocationProvinceResponse ...
@@ -60,36 +52,45 @@ type (
 	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"`
-		OldSlugs     []string `json:"oldSlugs"`
+		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"`
-		OldSlugs     []string     `json:"oldSlugs"`
+		SearchString string    `json:"searchString"`
 		Slug         string    `json:"slug"`
+		OldSlugs     []string  `json:"oldSlugs"`
 		Code         int       `json:"code"`
 		DistrictCode int       `json:"districtCode"`
 		ProvinceCode int       `json:"provinceCode"`
-		Location     *GEOLocation `json:"location"`
+		CreatedAt    time.Time `json:"createdAt"`
+		UpdatedAt    time.Time `json:"updatedAt"`
 	}
 )

model/order_request.go

@@ -49,7 +49,3 @@ type OrderSupplierQuery struct {
 	SupplierID   string   `json:"supplierId"`
 	WarehouseIDs []string `json:"warehouseIDs"`
 }
-
-type OrderGetTotalWarningPayload struct {
-	UserID string `json:"userId"`
-}

model/order_response.go

@@ -33,10 +33,3 @@ type SupplierOrderDelivery struct {
 	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"`
 }
-
-// OrderGetTotalWarningRes ...
-type OrderGetTotalWarningRes struct {
-	UserID            string     `json:"userId"`
-	TotalWarningOrder int64      `json:"totalWarningOrder"`
-	Action            ActionType `json:"action"`
-}

model/product_request.go

@@ -1,14 +0,0 @@
-package model
-
-type ProductApplyRequestPayload struct {
-	RequestID string `json:"requestId"`
-}
-
-type ProductCreateStepsPayload struct {
-	RequestID string `json:"requestId"`
-}
-
-type ProductRequestChangeStatus struct {
-	RequestID string `json:"requestId"`
-	Status    string `json:"status"`
-}

model/queue_request.go

@@ -1,8 +0,0 @@
-package model
-
-type QueueScheduleTaskRequest struct {
-	ID          string `json:"id"`
-	NatsSubject string `json:"natsSubject"`
-	Data        string `json:"data"`
-	StartAt     int64  `json:"startAt"` // unix
-}

model/segment_request.go

@@ -1,6 +0,0 @@
-package model
-
-// GetListSegmentRequest ...
-type GetListSegmentRequest struct {
-	SegmentIds []string `json:"segmentIds"`
-}

model/segment_response.go

@@ -1,12 +0,0 @@
-package model
-
-// ResponseSegmentInfo ...
-type ResponseSegmentInfo struct {
-	ID   string `json:"_id"`
-	Name string `json:"name"`
-}
-
-// ResponseListSegmentInfo ...
-type ResponseListSegmentInfo struct {
-	Segments []ResponseSegmentInfo `json:"segments"`
-}

model/seller_response.go

@@ -7,8 +7,6 @@ type ResponseSellerInfo struct {
 	ID   string `json:"_id"`
 	Name string `json:"name"`
 	Code string `json:"code"`
-	IsAccountPro  bool    `json:"isAccountPro"`
-	CashRemaining float64 `json:"cashRemaining"`
 }
 
 // ResponseListSellerInfo ...

model/social_post_request.go

@@ -1,13 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-// GetListSocialPostAppByIDsRequest ...
-type GetListSocialPostAppByIDsRequest struct {
-	SocialPostIDs []primitive.ObjectID `json:"socialPostIDs"`
-}
-
-// GetBriefInfoSocialPostAdminByIDsRequest ...
-type GetBriefInfoSocialPostAdminByIDsRequest struct {
-	SocialPostIDs []primitive.ObjectID `json:"socialPostIDs"`
-}

model/social_post_response.go

@@ -1,61 +0,0 @@
-package model
-
-import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"time"
-)
-
-// ResponseListSocialPostAppInfo ...
-type ResponseListSocialPostAppInfo struct {
-	SocialPosts []SocialPostAppInfo `json:"socialPosts"`
-}
-
-// SocialPostAppInfo ...
-type SocialPostAppInfo struct {
-	ID          primitive.ObjectID    `json:"_id"`
-	Title       string                `json:"title"`
-	Content     string                `json:"content"`
-	Statistic   SocialPostStatistic   `json:"statistic"`
-	Author      *SocialPostSellerInfo `json:"author"`
-	Photos      ListPhoto             `json:"photos"`
-	PublishedAt time.Time             `json:"publishedAt"`
-	IsLiked     bool                  `json:"isLiked"`
-	IsPin       bool                  `json:"isPin"`
-	Contributor *SocialPostSellerInfo `json:"contributor"`
-	CreatedAt   time.Time             `json:"createdAt"`
-	Status      string                `json:"status"`
-	HasUpdate   bool                  `json:"hasUpdate"`
-	Order       int                   `json:"order"`
-	Videos      ListVideo             `json:"videos"`
-}
-
-// SocialPostStatistic ...
-type SocialPostStatistic struct {
-	Views        int `json:"views"`
-	UniqueViews  int `json:"uniqueViews"`
-	Likes        int `json:"likes"`
-	Shares       int `json:"shares"`
-	UniqueShares int `json:"uniqueShares"`
-	Comments     int `json:"comments"`
-}
-
-// SocialPostSellerInfo ...
-type SocialPostSellerInfo struct {
-	ID         primitive.ObjectID   `json:"_id"`
-	Name       string               `json:"name"`
-	Membership SellerMembershipInfo `json:"membership"`
-	Logo       *FilePhoto           `json:"avatar"`
-	IsMine     bool                 `json:"isMine"`
-}
-
-// ResponseListSocialPostAdminInfo ...
-type ResponseListSocialPostAdminInfo struct {
-	SocialPosts []SocialPostAdminInfo `json:"socialPosts"`
-}
-
-// SocialPostAdminInfo ...
-type SocialPostAdminInfo struct {
-	ID     primitive.ObjectID `json:"_id"`
-	Title  string             `json:"title"`
-	Status string             `json:"status"`
-}

model/socket.go

@@ -1,19 +0,0 @@
-package model
-
-// PayloadEmitSocketEvent ...
-type PayloadEmitSocketEvent struct {
-	User        string `json:"user"`
-	Message     string `json:"message"`
-	Data        string `json:"data"`
-	IsNotRemove bool   `json:"isNotRemove"`
-}
-
-// PayloadEventSocketReward ...
-type PayloadEventSocketReward struct {
-	Type    string      `json:"type"`
-	Title   string      `json:"title"`
-	Cash    float64     `json:"cash"`
-	Message string      `json:"message"`
-	Photo   interface{} `json:"photo"`
-	Action  *ActionType `json:"action"`
-}

model/staff_request.go

@@ -1,6 +0,0 @@
-package model
-
-// GetListStaffRequest ...
-type GetListStaffRequest struct {
-	StaffIds []string `json:"staffIds"`
-}

model/staff_response.go

@@ -1,12 +0,0 @@
-package model
-
-// ResponseListStaffInfo ...
-type ResponseListStaffInfo struct {
-	Staffs []ResponseStaffInfo `json:"staffs"`
-}
-
-// ResponseStaffInfo ...
-type ResponseStaffInfo struct {
-	ID   string `json:"_id"`
-	Name string `json:"name"`
-}

model/supplier_request.go

@@ -9,11 +9,6 @@ type GetSupplierRequest struct {
 	ListID []primitive.ObjectID `json:"listID"`
 }
 
-// GetDetailSupplierRequest ...
-type GetDetailSupplierRequest struct {
-	Supplier string `json:"supplier"`
-}
-
 type GetSupplierContractRequest struct {
 	SupplierID primitive.ObjectID `json:"supplierID"`
 }
@@ -44,16 +39,16 @@ type UpdateSupplierWarehousePayload struct {
 	WardCode     int    `json:"wardCode"`
 }
 
-type SupplierFindAllReq struct {
+// SupplierCashflowCreatePayload ...
-	Page    int64    `json:"page"`
+type SupplierCashflowCreatePayload struct {
-	Limit   int64    `json:"limit"`
+	Supplier    string       `json:"supplier"`
-	Segment string   `json:"segment"`
+	Action      string       `json:"action"`
-	IDs     []string `json:"ids"`
+	Name        string       `json:"name"`
-	Status  string   `json:"status"` // active,inactive
+	TargetID    string       `json:"targetId"`
+	Value       float64      `json:"value"`
+	ClickAction *ClickAction `json:"clickAction"`
 }
 
-type SupplierCountReq struct {
+type SupplierFreeShipInfoRequestPayload struct {
-	Segment string   `json:"segment"`
+	SupplierIDs []string `json:"supplierIds"`
-	IDs     []string `json:"ids"`
-	Status  string   `json:"status"` // active,inactive
 }

model/supplier_response.go

@@ -5,7 +5,6 @@ type ResponseSupplierInfo struct {
 	ID           string `json:"id"`
 	Name         string `json:"name"`
 	BusinessType string `json:"businessType"`
-	IsSellyMall  bool   `json:"isSellyMall"`
 }
 
 // ResponseSupplierContract ...
@@ -31,6 +30,22 @@ type SupplierAll struct {
 	Total     int64           `json:"total"`
 }
 
-type SupplierCountRes struct {
+type SupplierListWarehouseFreeShipResponse struct {
-	Total int64 `json:"total"`
+	Warehouses []string `json:"warehouses"`
+}
+
+type SupplierCashflowCreateResponse struct {
+	ID string `json:"id"`
+}
+
+type FreeShip struct {
+	ID                string   `json:"_id"`
+	ShortName         string   `json:"shortName"`
+	ListMilestoneText []string `json:"milestoneText"`
+	Order             int      `json:"-"`
+}
+
+type SupplierFreeShipInfoResponse struct {
+	SupplierID string     `json:"supplierId"`
+	FreeShips  []FreeShip `json:"freeShips"`
 }

model/supplier_role_request.go

@@ -1,14 +0,0 @@
-package model
-
-type CreateRoleRequest struct {
-	Name string `json:"name"`
-	Code string `json:"code"`
-	Type string `json:"type"`
-}
-
-type UpdateRoleRequest struct {
-	ID   string `json:"_id"`
-	Name string `json:"name"`
-	Code string `json:"code"`
-	Type string `json:"type"`
-}

model/supplier_role_response.go

@@ -1,5 +0,0 @@
-package model
-
-type CreateRoleResponse struct {
-	ID string `json:"_id"`
-}

model/supplier_user_request.go

@@ -1,6 +1,6 @@
 package model
 
-type CreateOwnerRequest struct {
+type CreateSupplierOwnerUserRequest struct {
 	Name       string `json:"name"`
 	Phone      string `json:"phone"`
 	Email      string `json:"email"`
@@ -9,7 +9,7 @@ type CreateOwnerRequest struct {
 	Password   string `json:"password"`
 }
 
-type UpdateOwnerRequest struct {
+type UpdateSupplierOwnerUserRequest struct {
 	ID         string `json:"_id"`
 	SupplierID string `json:"supplierId"`
 	Name       string `json:"name"`
@@ -18,7 +18,7 @@ type UpdateOwnerRequest struct {
 	RoleID     string `json:"roleId"`
 }
 
-type CreateStaffRequest struct {
+type CreateSupplierStaffUserRequest struct {
 	Name       string   `json:"name"`
 	Phone      string   `json:"phone"`
 	Email      string   `json:"email"`
@@ -28,30 +28,14 @@ type CreateStaffRequest struct {
 	Warehouses []string `json:"warehouses"`
 }
 
-type UpdateStaffRequest struct {
+type UpdateSupplierStaffUserRequest struct {
 	ID         string   `json:"_id"`
 	Name       string   `json:"name"`
 	Phone      string   `json:"phone"`
 	Email      string   `json:"email"`
 	SupplierID string   `json:"supplierId"`
-	RoleID                  string   `json:"roleId"`
+	Role       string   `json:"role"`
 	Password   string   `json:"password"`
-	SupplierUserWarehouseID string   `json:"supplierUserWarehouseId"`
 	Warehouses []string `json:"warehouses"`
-}
+	RoleId     string   `json:"roleId"`
-
-type UpdateStatusRequest struct {
-	ID     string `json:"_id"`
-	Status string `json:"status"`
-}
-
-type ResetPasswordRequest struct {
-	ID       string `json:"_id"`
-	Password string `json:"password"`
-}
-
-// CheckTokenSupplierUserPayload ...
-type CheckTokenSupplierUserPayload struct {
-	Token       string   `json:"token"`
-	Permissions []string `json:"permissions"`
 }

model/supplier_user_response.go

@@ -1,26 +1,13 @@
 package model
 
-type CreateOwnerResponse struct {
+type CreateSupplierUserOwnerResponse struct {
 	ID string `json:"_id"`
 }
 
-type CreateStaffResponse struct {
+type CreateSupplierUserStaffResponse struct {
 	ID string `json:"_id"`
 }
 
-type ResetPasswordResponse struct {
+type GetListPermissionResponse struct {
-	Password string `json:"password"`
+	Permission []string `json:"permission"`
-}
-
-// ResponseCheckTokenSupplierUser ...
-type ResponseCheckTokenSupplierUser struct {
-	IsValid bool                     `json:"isValid"`
-	Reason  string                   `json:"reason"`
-	User    ResponseSupplierUserInfo `json:"supplier"`
-}
-
-type ResponseSupplierUserInfo struct {
-	ID         string `json:"_id"`
-	Name       string `json:"name"`
-	SupplierID string `json:"supplierId"`
 }

model/warehouse_request.go

@@ -42,7 +42,6 @@ type OutboundRequestItem struct {
 	UnitCode    string  `json:"unitCode"`
 	Price       float64 `json:"price"`
 	Name        string  `json:"name"`
-	PartnerProductCode string  `json:"partnerProductCode"`
 }
 
 // CustomerInfo ...
@@ -64,12 +63,11 @@ type AddressDetail struct {
 
 // UpdateOutboundRequestLogisticInfoPayload ...
 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"`
-	DeliveryStatus string `json:"deliveryStatus,omitempty"`
 }
 
 // CancelOutboundRequest ...
@@ -103,7 +101,6 @@ type GetWarehousesRequest struct {
 	Status       string `json:"status"`
 	Supplier     string `json:"supplier"`
 	BusinessType string `json:"businessType"`
-	IDs          []string `json:"ids"`
 
 	Page  int64 `json:"page"`
 	Limit int64 `json:"limit"`
@@ -116,24 +113,3 @@ type WarehouseORUpdateDeliveryStatus struct {
 	OrderID        string `json:"orderId"`
 	DeliveryStatus string `json:"deliveryStatus"`
 }
-
-// UpdateStatusWarehousePendingInactiveRequest ...
-type UpdateStatusWarehousePendingInactiveRequest struct {
-	Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"`
-}
-
-// UpdateIsSellyMallRequest ...
-type UpdateIsSellyMallRequest struct {
-	SupplierID string `json:"supplier"`
-}
-
-// UpdateStatusWarehousePendingInactive ...
-type UpdateStatusWarehousePendingInactive struct {
-	WarehouseID     string `json:"warehouse"`
-	PendingInactive bool   `json:"pendingInactive"`
-}
-
-type GetListWarehouseConfigReq struct {
-	PartnerCode         string `json:"partnerCode"`
-	PartnerIdentityCode string `json:"partnerIdentityCode"`
-}

model/warehouse_response.go

@@ -65,24 +65,12 @@ type WarehouseOrder struct {
 	PaymentMethod            WarehousePaymentMethod `json:"paymentMethod"`
 	IsLimitNumberOfPurchases bool                   `json:"isLimitNumberOfPurchases"`
 	LimitNumberOfPurchases   int64                  `json:"limitNumberOfPurchases"`
-	NotifyOnNewOrder               WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"`
-	LabelSize                      string                          `json:"labelSize"`
-	MaximumOrderValue              float64                         `json:"maximumOrderValue"`
-	MaximumNumberPerBuyerEachMonth int64                           `json:"maximumNumberPerBuyerEachMonth"`
-}
-
-// WarehouseConfigNotifyOnNewOrder ...
-type WarehouseConfigNotifyOnNewOrder struct {
-	Enable  bool   `bson:"enable" json:"enable"`
-	Channel string `bson:"channel" json:"channel"`
-	RoomID  string `bson:"roomId" json:"roomId"`
 }
 
 // WarehousePaymentMethod ...
 type WarehousePaymentMethod struct {
 	Cod          bool `json:"cod"`
 	BankTransfer bool `json:"bankTransfer"`
-	Fundiin      bool `json:"fundiin"`
 }
 
 // WarehouseDelivery ...
@@ -154,10 +142,6 @@ type WarehouseNatsResponse struct {
 	Configurations WarehouseConfiguration    `json:"configurations"`
 	CreatedAt      time.Time                 `json:"createdAt"`
 	UpdatedAt      time.Time                 `json:"updatedAt"`
-	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
-	IsPendingInactive     bool                      `json:"isPendingInactive"`
-	IsFromInternational   bool                      `json:"isFromInternational"`
-	StoreCode             string                    `json:"storeCode"`
 }
 
 // WarehouseInfo ...
@@ -186,9 +170,3 @@ type GetWarehousesResponse struct {
 	Limit int64           `json:"limit"`
 	List  []WarehouseInfo `json:"list"`
 }
-
-type GetListWarehouseConfigRes struct {
-	Total int64                    `json:"total"`
-	Limit int64                    `json:"limit"`
-	List  []WarehouseConfiguration `json:"list"`
-}

subject/affiliate.go

@@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getAffiliateValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Affiliate, val)
-}
-
-var Affiliate = struct {
-	GetTransactions string
-}{
-	GetTransactions: getAffiliateValue("get_transactions"),
-}

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/campaign.go

@@ -1,17 +0,0 @@
-package subject
-
-import "fmt"
-
-// getCampaignValue ...
-func getCampaignValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Campaign, val)
-}
-
-// Campaign ...
-var Campaign = struct {
-	GetListCampaignTransactionAdminInfoByIDs string
-	GetCampaignSellerStatisticBySellerIDs    string
-}{
-	GetListCampaignTransactionAdminInfoByIDs: getCampaignValue("get_list_campaign_transaction_admin_info_by_ids"),
-	GetCampaignSellerStatisticBySellerIDs:    getCampaignValue("get_campaign_seller_statistic_by_seller_ids"),
-}

subject/config.go

@@ -9,16 +9,9 @@ var prefixes = struct {
 	Bank          string
 	Supplier      string
 	Seller        string
+	AuthSMS       string
+	Selly         string
 	SupplierUser  string
-	SupplierRole  string
-	SocialPost    string
-	Staff         string
-	Segment       string
-	Product       string
-	Queue         string
-	Campaign      string
-	Affiliate     string
-	Socket        string
 }{
 	Communication: "communication",
 	Order:         "order",
@@ -28,14 +21,7 @@ var prefixes = struct {
 	Supplier:      "supplier",
 	Bank:          "bank",
 	Seller:        "seller",
+	AuthSMS:       "auth_sms",
+	Selly:         "selly",
 	SupplierUser:  "supplier_user",
-	SupplierRole:  "supplier_role",
-	SocialPost:    "social_post",
-	Staff:         "staff",
-	Segment:       "segment",
-	Product:       "product",
-	Queue:         "queue",
-	Campaign:      "campaign",
-	Affiliate:     "affiliate",
-	Socket:        "socket",
 }

subject/location.go

@@ -8,14 +8,9 @@ func getLocationValue(val string) string {
 
 var Location = struct {
 	GetLocationByCode         string
-	GetLocationByCodeFromLocationService   string
-	GetLocationByWardCode                  string
 	GetProvincesByCodes       string
-	GetProvincesByCodesFromLocationService string
 	GetDistrictsByCodes       string
-	GetDistrictsByCodesFromLocationService string
 	GetWardsByCodes           string
-	GetWardsByCodesFromLocationService     string
 	GetProvinceByCondition    string
 	GetProvincesByCondition   string
 	GetDistrictByCondition    string
@@ -28,14 +23,9 @@ var Location = struct {
 	ProvinceDistinctWithField string
 }{
 	GetLocationByCode:         getLocationValue("get_location_warehouse"),
-	GetLocationByCodeFromLocationService:   getLocationValue("get_location_warehouse_from_location_service"),
-	GetLocationByWardCode:                  getLocationValue("get_location_by_ward_code"),
 	GetProvincesByCodes:       getLocationValue("get_provinces_by_codes"),
-	GetProvincesByCodesFromLocationService: getLocationValue("get_provinces_by_codes_from_location_service"),
 	GetDistrictsByCodes:       getLocationValue("get_districts_by_codes"),
-	GetDistrictsByCodesFromLocationService: getLocationValue("get_districts_by_codes_from_location_service"),
 	GetWardsByCodes:           getLocationValue("get_wards_by_codes"),
-	GetWardsByCodesFromLocationService:     getLocationValue("get_wards_by_codes_from_location_service"),
 	GetProvinceByCondition:    getLocationValue("get_province_by_condition"),
 	GetProvincesByCondition:   getLocationValue("get_provinces_by_condition"),
 	GetDistrictByCondition:    getLocationValue("get_district_by_condition"),

subject/order.go

@@ -8,7 +8,6 @@ func getOrderValue(val string) string {
 
 var Order = struct {
 	UpdateORStatus           string
-	GetUserTotalWarningOrders string
 	CancelDelivery           string
 	ChangeDeliveryStatus     string
 	UpdateLogisticInfoFailed string
@@ -16,7 +15,6 @@ var Order = struct {
 	GetSupplierOrders        string
 }{
 	UpdateORStatus:           getOrderValue("update_outbound_request_status"),
-	GetUserTotalWarningOrders: getOrderValue("get_user_total_warning_orders"),
 	CancelDelivery:           getOrderValue("cancel_delivery"),
 	ChangeDeliveryStatus:     getOrderValue("change_delivery_status"),
 	UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),

subject/product.go

@@ -1,26 +0,0 @@
-package subject
-
-import "fmt"
-
-// getSegmentValue ...
-func getProductValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Product, val)
-}
-
-var Product = struct {
-	ApplyRequest                                        string
-	CreateRequestStep                                   string
-	ProcessApplyRequest                                 string
-	RequestChangeStatus                                 string
-	WebhookStockUpdate                                  string // WebhookStockUpdate Kiotviet queue
-	OPWebhookStockUpdate                                string // OPWebhookStockUpdate Onpoint queue
-	OrderPaymentBankTransferWebhookCheckAndUpdateStatus string
-}{
-	ApplyRequest:         getProductValue("apply_request"),
-	CreateRequestStep:    getProductValue("create_request_step"),
-	ProcessApplyRequest:  getProductValue("process_apply_request"),
-	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"),
-}

subject/queue.go

@@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getQueueValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Queue, val)
-}
-
-var Queue = struct {
-	ScheduleTask string
-}{
-	ScheduleTask: getQueueValue("schedule_task"),
-}

subject/segment.go

@@ -1,15 +0,0 @@
-package subject
-
-import "fmt"
-
-// getSegmentValue ...
-func getSegmentValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Segment, val)
-}
-
-// Segment ...
-var Segment = struct {
-	GetListSegmentInfo string
-}{
-	GetListSegmentInfo: getSegmentValue("get_list_segment_info"),
-}

subject/social_post.go

@@ -1,17 +0,0 @@
-package subject
-
-import "fmt"
-
-// getSocialPostValue ...
-func getSocialPostValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.SocialPost, val)
-}
-
-// SocialPost ...
-var SocialPost = struct {
-	GetListSocialPostAppInfoByIDs    string
-	GetBriefInfoSocialPostAdminByIDs string
-}{
-	GetListSocialPostAppInfoByIDs:    getSocialPostValue("get_list_social_post_app_info_by_ids"),
-	GetBriefInfoSocialPostAdminByIDs: getSocialPostValue("get_brief_info_social_post_admin_by_ids"),
-}

subject/socket.go

@@ -1,16 +0,0 @@
-package subject
-
-import "fmt"
-
-func getSocketValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Socket, val)
-}
-
-// Socket ...
-var Socket = struct {
-	EmitEventReward string
-	EmitEventToUser string
-}{
-	EmitEventReward: getSocketValue("emit_event_reward"),
-	EmitEventToUser: "send_message_to_socket",
-}

subject/staff.go

@@ -1,14 +0,0 @@
-package subject
-
-import "fmt"
-
-func getStaffValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Staff, val)
-}
-
-// Staff ...
-var Staff = struct {
-	GetListStaffInfo string
-}{
-	GetListStaffInfo: getStaffValue("get_list_staff_info"),
-}

subject/supplier.go

@@ -8,16 +8,16 @@ func getSupplierValue(val string) string {
 
 var Supplier = struct {
 	GetListSupplierInfo             string
-	GetDetailSupplierInfo           string
 	GetSupplierContractBySupplierID string
 	FindAll                         string
-	FindAllOld                      string
+	GetListWarehouseFreeShip        string
-	Count                           string
+	CreateCashflow                  string
+	GetFreeShipInfo                 string
 }{
 	GetListSupplierInfo:             getSupplierValue("get_list_supplier_info"),
-	GetDetailSupplierInfo:           getSupplierValue("get_detail_supplier_info"),
 	GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
 	FindAll:                         getSupplierValue("find_all"),
-	FindAllOld:                      getSupplierValue("find_all_old"),
+	GetListWarehouseFreeShip:        getSupplierValue("get_list_warehouse_free_ship"),
-	Count:                           getSupplierValue("count"),
+	CreateCashflow:                  getSupplierValue("create_cashflow"),
+	GetFreeShipInfo:                 getSupplierValue("get_free_ship_info"),
 }

subject/supplier_role.go

@@ -1,15 +0,0 @@
-package subject
-
-import "fmt"
-
-func getRoleValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.SupplierRole, val)
-}
-
-var SupplierRole = struct {
-	Create string
-	Update string
-}{
-	Create: getRoleValue("create"),
-	Update: getRoleValue("update"),
-}

subject/supplier_user.go

@@ -2,26 +2,18 @@ package subject
 
 import "fmt"
 
-func getSupplierUserValue(val string) string {
+func getAuthSMSValue(val string) string {
 	return fmt.Sprintf("%s.%s", prefixes.SupplierUser, val)
 }
 
 var SupplierUser = struct {
-	// Users
+	CreateSupplierOwnerUser string
-	CreateOwner            string
+	UpdateSupplierOwnerUser string
-	UpdateOwner            string
+	CreateSupplierStaffUser string
-	CreateStaff            string
+	UpdateSupplierStaffUser string
-	UpdateStaff            string
-	UpdateStatus           string
-	ResetPassword          string
-	CheckTokenSupplierUser string
 }{
-	// Users
+	CreateSupplierOwnerUser: getAuthSMSValue("create_supplier_owner_user"),
-	CreateOwner:            getSupplierUserValue("create_owner"),
+	UpdateSupplierOwnerUser: getAuthSMSValue("update_supplier_owner_user"),
-	UpdateOwner:            getSupplierUserValue("update_owner"),
+	CreateSupplierStaffUser: getAuthSMSValue("create_supplier_staff_user"),
-	CreateStaff:            getSupplierUserValue("create_staff"),
+	UpdateSupplierStaffUser: getAuthSMSValue("update_supplier_staff_user"),
-	UpdateStaff:            getSupplierUserValue("update_staff"),
-	UpdateStatus:           getSupplierUserValue("update_status"),
-	ResetPassword:          getSupplierUserValue("reset_password"),
-	CheckTokenSupplierUser: getSupplierUserValue("check_token_supplier_user"),
 }

subject/warehouse.go

@@ -1,8 +1,6 @@
 package subject
 
-import (
+import "fmt"
-	"fmt"
-)
 
 func getWarehouseValue(val string) string {
 	return fmt.Sprintf("%s.%s", prefixes.Warehouse, val)
@@ -19,7 +17,6 @@ var Warehouse = struct {
 	WebhookTNC                         string
 	WebhookGlobalCare                  string
 	WebhookOnPoint                     string
-	WebhookViettelFFM                    string
 	FindOne                            string
 	FindByCondition                    string
 	Distinct                           string
@@ -29,11 +26,6 @@ var Warehouse = struct {
 	UpdateIsClosedSupplier             string
 	GetWarehouses                      string
 	UpdateORDeliveryStatus             string
-	UpdateStatusWarehousePendingInactive string
-	UpdateIsSellyMall                    string
-	UpdateWarehouseConfig                string
-	BulkWriteWarehouseConfig             string
-	GetListWarehouseConfig               string
 }{
 	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
@@ -47,7 +39,6 @@ var Warehouse = struct {
 	WebhookTNC:                         getWarehouseValue("webhook_tnc"),
 	WebhookGlobalCare:                  getWarehouseValue("webhook_global_care"),
 	WebhookOnPoint:                     getWarehouseValue("webhook_on_point"),
-	WebhookViettelFFM:                    getWarehouseValue("webhook_viettel_ffm"),
 	FindOne:                            getWarehouseValue("find_one"),
 	FindByCondition:                    getWarehouseValue("find_all_by_condition"),
 	Distinct:                           getWarehouseValue("distinct"),
@@ -55,9 +46,4 @@ var Warehouse = struct {
 	UpdateIsClosedSupplier:             getWarehouseValue("update_is_closed_supplier"),
 	GetWarehouses:                      getWarehouseValue("get_warehouses"),
 	UpdateORDeliveryStatus:             getWarehouseValue("update_or_delivery_status"),
-	UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"),
-	UpdateIsSellyMall:                    getWarehouseValue("update_is_selly_mall"),
-	UpdateWarehouseConfig:                getWarehouseValue("update_warehouse_config"),
-	BulkWriteWarehouseConfig:             getWarehouseValue("bulk_write_warehouse_config"),
-	GetListWarehouseConfig:               getWarehouseValue("get_list_warehouse_config"),
 }