fix conflict

Reviewed-on: #129

README.md

@@ -1 +1 @@
-# natsio
+# natsio module

client/auth_sms.go

@@ -0,0 +1,37 @@
+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"
+)
+
+// AuthSMS ...
+type AuthSMS struct{}
+
+// GetAuthSMS ...
+func GetAuthSMS() AuthSMS {
+	return AuthSMS{}
+}
+
+func (s AuthSMS) CheckPermission(p model.CheckPermissionRequest) error {
+	msg, err := natsio.GetServer().Request(subject.AuthSMS.CheckPermission, 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/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,18 +39,40 @@ 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
 	}
 
 	var r struct {
-		Error string `json:"error"`
+		Data bool `json:"data"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
 		return false
 	}
-	return r.Error == ""
+	return r.Data
+}
+
+// GetBankAndBranchDetail ...
+func (s Bank) GetBankAndBranchDetail(p model.GetBankInfoRequest) (*model.ResponseBankInfo, error) {
+	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfoDetail, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.ResponseBankInfo `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_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/email.go

@@ -0,0 +1,30 @@
+package client
+
+// Email ...
+type Email struct{}
+
+// GetEmail ...
+func GetEmail() Email {
+	return Email{}
+}
+
+// func (s Email) Send(p model.GetEmailRequest) ([]*model.ResponseEmailInfo, error) {
+// 	msg, err := natsio.GetServer().Request(subject.Email.GetListEmailInfo, toBytes(p))
+// 	if err != nil {
+// 		return nil, err
+// 	}
+//
+// 	var r struct {
+// 		Data  []*model.ResponseEmailInfo `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.GetLocationByCodeNew, 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.GetProvincesByCodesNew, 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.GetDistrictsByCodesNew, 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.GetWardsByCodesNew, toBytes(p))
 	if err != nil {
 		return nil, err
 	}

client/notification.go

@@ -0,0 +1,31 @@
+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"
+)
+
+func GetNotification() Notification {
+	return Notification{}
+}
+
+type Notification struct{}
+
+func (n Notification) SupplierChangeBalanceRequestApproved(p model.NotificationSupplierChangeBalanceRequestApprovedReq) error {
+	msg, err := natsio.GetServer().Request(subject.Notification.SupplierChangeBalanceRequestApproved, toBytes(p))
+	if err != nil {
+		return err
+	}
+	var r model.CommonResponseData
+	if err = json.Unmarshal(msg.Data, &r); err != nil {
+		return err
+	}
+	if r.Error != "" {
+		return errors.New(r.Error)
+	}
+	return nil
+}

client/order.go

@@ -120,16 +120,18 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
 	return &r.Data, nil
 }
 
-// GetUserTotalWarningOrder ...
+// GetSupplierCash ...
-func (o Order) GetUserTotalWarningOrder(p model.OrderGetTotalWarningPayload) (*model.OrderGetTotalWarningRes, error) {
+func (o Order) GetSupplierCash(p model.OrderSupplierCashReq) (*model.OrderSupplierCashRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Order.GetUserTotalWarningOrders, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Order.GetSupplierCash, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
-	var r struct {
+	var (
-		Data  model.OrderGetTotalWarningRes `json:"data"`
+		r struct {
+			Data  model.OrderSupplierCashRes `json:"data"`
 			Error string                     `json:"error"`
 		}
+	)
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}

client/product.go

@@ -34,23 +34,6 @@ func (c Product) ApplyRequest(p model.ProductApplyRequestPayload) 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 {
@@ -67,20 +50,3 @@ func (c Product) ProcessApplyRequest(p model.ProductApplyRequestPayload) 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/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/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"
@@ -165,9 +166,9 @@ func (s Supplier) Count(req model.SupplierCountReq) (*model.SupplierCountRes, er
 	return r.Data, nil
 }
 
-// CreateWarehouseIntoServiceSupplier ...
+// SyncWarehouseIntoServiceSupplier ...
-func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error {
+func (s Supplier) SyncWarehouseIntoServiceSupplier(p model.SyncSupplierWarehousePayload) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Warehouse.SyncWarehouseIntoServiceSupplier, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -183,9 +184,104 @@ func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWareh
 	return nil
 }
 
-// UpdateWarehouseIntoServiceSupplier ...
+// GetListWarehouseFreeShip ...
-func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWarehousePayload) error {
+func (s Supplier) GetListWarehouseFreeShip() (*model.SupplierListWarehouseFreeShipResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateWarehouseIntoServiceSupplier, toBytes(p))
+	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
+}
+
+func (s Supplier) UpdateBalance(p model.SupplierUpdateBalanceReq) (*model.SupplierUpdateBalanceRes, error) {
+	msg, err := natsio.GetServer().Request(subject.Supplier.UpdateBalance, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var r struct {
+		Error string                          `json:"error"`
+		Data  *model.SupplierUpdateBalanceRes `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
+}
+
+func (s Supplier) GetCurrentBalance(p model.SupplierGetCurrentBalanceReq) (*model.SupplierGetCurrentBalanceRes, error) {
+	msg, err := natsio.GetServer().Request(subject.Supplier.GetCurrentBalance, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var r struct {
+		Error string                              `json:"error"`
+		Data  *model.SupplierGetCurrentBalanceRes `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
+}
+
+func (s Supplier) DeleteCashflow(p model.SupplierDeleteCashflowReq) error {
+	msg, err := natsio.GetServer().Request(subject.Supplier.DeleteCashflow, toBytes(p))
 	if err != nil {
 		return err
 	}

client/supplier_permission.go

@@ -0,0 +1,79 @@
+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"
+)
+
+// SupplierPermission ...
+type SupplierPermission struct{}
+
+// GetSupplierPermission ...
+func GetSupplierPermission() SupplierPermission {
+	return SupplierPermission{}
+}
+
+func (s SupplierPermission) GetListPermission(p model.GetListPermissionRequest) (*model.GetListPermissionResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierPermission.GetList, toBytes(p))
+	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
+}
+
+func (s SupplierPermission) CreatePermission(p model.CreatePermissionRequest) (*model.CreatePermissionResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierPermission.Create, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.CreatePermissionResponse `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 SupplierPermission) UpdatePermission(p model.UpdatePermissionRequest) error {
+	msg, err := natsio.GetServer().Request(subject.SupplierPermission.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_role.go

@@ -16,8 +16,28 @@ func GetSupplierRole() SupplierRole {
 	return SupplierRole{}
 }
 
+func (s SupplierRole) GetListRole(p model.GetListRoleRequest) (*model.GetListRoleResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierRole.GetList, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.GetListRoleResponse `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) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierRole.Create, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -56,3 +76,24 @@ func (s SupplierRole) UpdateRole(p model.UpdateRoleRequest) error {
 
 	return nil
 }
+
+func (s SupplierRole) DetailRole(p model.DetailRoleRequest) (*model.RoleBrief, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierRole.Detail, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.RoleBrief `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_user.go

@@ -16,6 +16,89 @@ func GetSupplierUser() SupplierUser {
 	return SupplierUser{}
 }
 
+func (s SupplierUser) LoginUser(p model.LoginUserRequest) (*model.LoginUserResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.LoginUser, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.LoginUserResponse `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 SupplierUser) Logout(p model.LogoutRequest) error {
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.Logout, 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) GetListUser(p model.GetListUserRequest) (*model.GetListUserResponse, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListUser, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.GetListUserResponse `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 SupplierUser) DetailUser(p model.DetailUserRequest) (*model.SupplierUserBrief, error) {
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.DetailUser, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.SupplierUserBrief `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 SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) {
 	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
 	if err != nil {
@@ -99,7 +182,7 @@ func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error
 }
 
 func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -139,6 +222,26 @@ func (s SupplierUser) ResetPassword(p model.ResetPasswordRequest) (*model.ResetP
 	return r.Data, nil
 }
 
+func (s SupplierUser) ChangePassword(p model.ChangePasswordRequest) error {
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, 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
+}
+
 // CheckTokenSupplierUser ...
 func (s SupplierUser) CheckTokenSupplierUser(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
 	msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckTokenSupplierUser, toBytes(p))

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))
@@ -202,9 +183,9 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
 	return nil
 }
 
-// UpdateStatusWarehousePendingInactive ...
+// UpdatePendingActiveProductByWarehouseIDs ...
-func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error {
+func (w Warehouse) UpdatePendingActiveProductByWarehouseIDs(p model.UpdatePendingActiveProductRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingActiveProductByWarehouseIDs, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -214,27 +195,7 @@ func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWare
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return fmt.Errorf("nats: update_status_warehouse_pending_inactive %v", err)
+		return fmt.Errorf("nats: update_pending_active_product_by_warehouse_ids %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)

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

client/withdraw.go

@@ -0,0 +1,39 @@
+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"
+)
+
+// Withdraw ...
+type Withdraw struct{}
+
+// GetWithdraw ...
+func GetWithdraw() Withdraw {
+	return Withdraw{}
+}
+
+// GetSupplierCash ...
+func (o Withdraw) GetSupplierCash(p model.WithdrawSupplierCashReq) (*model.WithdrawSupplierCashRes, error) {
+	msg, err := natsio.GetServer().Request(subject.Withdraw.GetSupplierCash, toBytes(p))
+	if err != nil {
+		return nil, err
+	}
+	var (
+		r struct {
+			Data  model.WithdrawSupplierCashRes `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
+}

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"`
@@ -17,8 +15,6 @@ 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 ...
@@ -66,45 +62,4 @@ type CashFlowOptions struct {
 	// 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/auth_sms_request.go

@@ -0,0 +1,7 @@
+package model
+
+type CheckPermissionRequest struct {
+	Value    []string `json:"value"`
+	ID       string   `json:"_id"`
+	DeviceID string   `json:"deviceId"`
+}

model/auth_sms_response.go

@@ -0,0 +1 @@
+package model

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"`
 }
 
+// BranchBrief ...
+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/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"`
@@ -43,14 +49,3 @@ type RequestCondition struct {
 	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/location_response.go

@@ -32,13 +32,6 @@ type (
 		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 ...
@@ -90,6 +83,5 @@ type (
 		Code         int      `json:"code"`
 		DistrictCode int      `json:"districtCode"`
 		ProvinceCode int      `json:"provinceCode"`
-		Location     *GEOLocation `json:"location"`
 	}
 )

model/notification_request.go

@@ -0,0 +1,7 @@
+package model
+
+type NotificationSupplierChangeBalanceRequestApprovedReq struct {
+	SupplierID string  `json:"supplierId"`
+	Cash       float64 `json:"cash"`
+	Reason     string  `json:"reason"`
+}

model/notification_response.go

@@ -0,0 +1 @@
+package model

model/order_request.go

@@ -50,6 +50,6 @@ type OrderSupplierQuery struct {
 	WarehouseIDs []string `json:"warehouseIDs"`
 }
 
-type OrderGetTotalWarningPayload struct {
+type OrderSupplierCashReq struct {
-	UserID string `json:"userId"`
+	SupplierID string `json:"supplierId"`
 }

model/order_response.go

@@ -34,9 +34,8 @@ type SupplierOrderDelivery struct {
 	TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
 }
 
-// OrderGetTotalWarningRes ...
+type OrderSupplierCashRes struct {
-type OrderGetTotalWarningRes struct {
+	PendingCash             float64 `json:"pendingCash"`
-	UserID            string     `json:"userId"`
+	WaitingForReconcileCash float64 `json:"waitingForReconcileCash"`
-	TotalWarningOrder int64      `json:"totalWarningOrder"`
+	ReconciledCash          float64 `json:"reconciledCash"`
-	Action            ActionType `json:"action"`
 }

model/product_request.go

@@ -3,12 +3,3 @@ 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/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/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/supplier_device_request.go

@@ -0,0 +1 @@
+package model

model/supplier_device_response.go

@@ -0,0 +1 @@
+package model

model/supplier_permission_request.go

@@ -0,0 +1,24 @@
+package model
+
+type GetListPermissionRequest struct {
+	Page  int    `json:"page"`
+	Limit int    `json:"limit"`
+	Group string `json:"group"`
+}
+
+type DetailPermissionRequest struct {
+	ID string `json:"_id"`
+}
+
+type CreatePermissionRequest struct {
+	Name  string `json:"name"`
+	Code  string `json:"code"`
+	Group string `json:"group"`
+}
+
+type UpdatePermissionRequest struct {
+	ID    string `json:"_id"`
+	Name  string `json:"name"`
+	Code  string `json:"code"`
+	Group string `json:"group"`
+}

model/supplier_permission_response.go

@@ -0,0 +1,26 @@
+package model
+
+type GetListPermissionResponse struct {
+	Permissions []PermissionBrief `json:"permissions"`
+	Total       int64             `json:"total"`
+}
+
+type PermissionBrief struct {
+	ID        string `json:"_id"`
+	Name      string `json:"name"`
+	Code      string `json:"code"`
+	Group     string `json:"group"`
+	CreatedAt string `json:"createdAt"`
+	UpdatedAt string `json:"updatedAt"`
+}
+
+type CreatePermissionResponse struct {
+	ID string `json:"_id"`
+}
+
+type PermissionShort struct {
+	ID    string `json:"_id"`
+	Name  string `json:"name"`
+	Code  string `json:"code"`
+	Group string `json:"group"`
+}

model/supplier_request.go

@@ -28,20 +28,30 @@ type SupplierRequestPayload struct {
 	ContractStatus string
 }
 
-type CreateSupplierWarehousePayload struct {
+// SupplierCashflowCreatePayload ...
+type SupplierCashflowCreatePayload struct {
 	Supplier    string       `json:"supplier"`
-	Warehouse    string `json:"warehouse"`
+	Action      string       `json:"action"`
-	ProvinceCode int    `json:"provinceCode"`
+	Name        string       `json:"name"`
-	DistrictCode int    `json:"districtCode"`
+	TargetID    string       `json:"targetId"`
-	WardCode     int    `json:"wardCode"`
+	Value       float64      `json:"value"`
+	ClickAction *ClickAction `json:"clickAction"`
 }
 
-type UpdateSupplierWarehousePayload struct {
+type SupplierFreeShipInfoRequestPayload struct {
-	Supplier     string `json:"supplier"`
+	SupplierIDs []string `json:"supplierIds"`
-	Warehouse    string `json:"warehouse"`
+}
-	ProvinceCode int    `json:"provinceCode"`
+
-	DistrictCode int    `json:"districtCode"`
+type SupplierUpdateBalanceReq struct {
-	WardCode     int    `json:"wardCode"`
+	SupplierID string `json:"supplierId"`
+}
+
+type SupplierGetCurrentBalanceReq struct {
+	SupplierID string `json:"supplierId"`
+}
+
+type SupplierDeleteCashflowReq struct {
+	CashflowID string `json:"cashflowId"`
 }
 
 type SupplierFindAllReq struct {

model/supplier_response.go

@@ -5,7 +5,54 @@ type ResponseSupplierInfo struct {
 	ID           string            `json:"id"`
 	Name         string            `json:"name"`
 	BusinessType string            `json:"businessType"`
-	IsSellyMall  bool   `json:"isSellyMall"`
+	Statistic    SupplierStatistic `json:"statistic"`
+	Rating       float64           `json:"rating"`
+	Inventories  []*SKUCommonInfo  `json:"inventories"`
+	Active       bool              `json:"active"`
+}
+
+// SupplierStatistic ...
+type SupplierStatistic struct {
+	TotalInventory      int64   `json:"totalInventory"`
+	TotalQuantitySale   int64   `json:"totalQuantitySale"`
+	TotalProduct        int64   `json:"totalProduct"`
+	TotalHasOrderSeller int64   `json:"totalHasOrderSeller"`
+	TotalFollower       int64   `json:"totalFollower"`
+	SalesTotal          float64 `json:"salesTotal"`
+	SalesWeekTotal      float64 `json:"salesWeekTotal"`
+	SalesMonthTotal     float64 `json:"salesMonthTotal"`
+	SalesTwoMonthTotal  float64 `json:"salesTwoMonthTotal"`
+	SalesYearTotal      float64 `json:"salesYearTotal"`
+	SalesSuccess        float64 `json:"salesSuccess"`
+	SalesPending        float64 `json:"salesPending"`
+	SalesCancelled      float64 `json:"salesCancelled"`
+}
+
+// SKUCommonInfo ...
+type SKUCommonInfo struct {
+	Code         int                `json:"id,omitempty" bson:"id,omitempty"`
+	ID           string             `json:"_id" bson:"_id"`
+	Name         string             `json:"name" bson:"name"`
+	SearchString string             `json:"-" bson:"searchString,omitempty"`
+	Location     *LocationInventory `json:"location,omitempty" bson:"location,omitempty"`
+	MinimumValue float64            `json:"minimumValue,omitempty" bson:"-"`
+}
+
+// LocationInventory ...
+type LocationInventory struct {
+	Address      string         `bson:"address" json:"address"`
+	Province     string         `bson:"province" json:"province"`
+	ProvinceName string         `bson:"provinceName,omitempty" json:"provinceName,omitempty"`
+	District     string         `bson:"district" json:"district"`
+	Ward         string         `bson:"ward" json:"ward"`
+	FullAddress  string         `bson:"fullAddress,omitempty" json:"fullAddress,omitempty"`
+	Location     *MongoLocation `bson:"location" json:"location"`
+}
+
+// MongoLocation ...
+type MongoLocation struct {
+	Type        string    `bson:"type"`
+	Coordinates []float64 `bson:"coordinates"`
 }
 
 // ResponseSupplierContract ...
@@ -31,6 +78,57 @@ type SupplierAll struct {
 	Total     int64           `json:"total"`
 }
 
+type SupplierListWarehouseFreeShipResponse struct {
+	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"`
+}
+
+type SupplierShort struct {
+	ID   string      `json:"_id"`
+	Name string      `json:"name"`
+	Logo interface{} `json:"logo"`
+}
+
+type SupplierUpdateBalanceRes struct {
+	CurrentCash                  float64 `json:"currentCash"`
+	TotalPendingCash             float64 `json:"totalPendingCash"`
+	OrderPendingCash             float64 `json:"orderPendingCash"`
+	OrderWaitingForReconcileCash float64 `json:"orderWaitingForReconcileCash"`
+	OrderReconciledCash          float64 `json:"orderReconciledCash"`
+	WithdrawPendingCash          float64 `json:"withdrawPendingCash"`
+	WithdrawSuccessCash          float64 `json:"withdrawSuccessCash"`
+	WithdrawRejectCash           float64 `json:"withdrawRejectCash"`
+	ChangeBalanceRequestApproved float64 `json:"changeBalanceRequestApproved"`
+	UpdatedAt                    string  `json:"updatedAt"`
+}
+
+type SupplierGetCurrentBalanceRes struct {
+	CurrentCash float64 `json:"currentCash"`
+}
+
+type SyncSupplierWarehousePayload struct {
+	Supplier     string `json:"supplier"`
+	Warehouse    string `json:"warehouse"`
+	ProvinceCode int    `json:"provinceCode"`
+	DistrictCode int    `json:"districtCode"`
+	WardCode     int    `json:"wardCode"`
+}
+
 type SupplierCountRes struct {
 	Total int64 `json:"total"`
 }

model/supplier_role_request.go

@@ -1,9 +1,22 @@
 package model
 
+type GetListRoleRequest struct {
+	Page       int    `json:"page"`
+	Limit      int    `json:"limit"`
+	Type       string `json:"type"`
+	SupplierID string `json:"supplierId"`
+}
+
+type DetailRoleRequest struct {
+	ID string `json:"_id"`
+}
+
 type CreateRoleRequest struct {
 	Name        string   `json:"name"`
 	Code        string   `json:"code"`
 	Type        string   `json:"type"`
+	SupplierID  string   `json:"supplierId"`
+	Permissions []string `json:"permissions"`
 }
 
 type UpdateRoleRequest struct {
@@ -11,4 +24,6 @@ type UpdateRoleRequest struct {
 	Name        string   `json:"name"`
 	Code        string   `json:"code"`
 	Type        string   `json:"type"`
+	SupplierID  string   `json:"supplierId"`
+	Permissions []string `json:"permissions"`
 }

model/supplier_role_response.go

@@ -1,5 +1,29 @@
 package model
 
+type GetListRoleResponse struct {
+	Roles []RoleBrief `json:"roles"`
+	Total int64       `json:"total"`
+}
+
+type RoleBrief struct {
+	ID          string            `json:"_id"`
+	Name        string            `json:"name"`
+	Code        string            `json:"code"`
+	Type        string            `json:"type"`
+	Permissions []PermissionShort `json:"permissions"`
+	SupplierId  string            `json:"supplierId"`
+	CreatedAt   string            `json:"createdAt"`
+	UpdatedAt   string            `json:"updatedAt"`
+}
+
 type CreateRoleResponse struct {
 	ID string `json:"_id"`
 }
+
+type RoleShort struct {
+	ID         string `json:"_id"`
+	Name       string `json:"name"`
+	Code       string `json:"code"`
+	Type       string `json:"type"`
+	SupplierId string `json:"supplierId"`
+}

model/supplier_user_request.go

@@ -1,12 +1,44 @@
 package model
 
+type LoginUserRequest struct {
+	Email        string `json:"email"`
+	Password     string `json:"password"`
+	DeviceID     string `json:"deviceId"`
+	AppVersion   string `json:"appVersion"`
+	UserAgent    string `json:"userAgent"`
+	Model        string `json:"model"`
+	Manufacturer string `json:"manufacturer"`
+	IP           string `json:"ip"`
+	Language     string `json:"language"`
+	FCMToken     string `json:"FCMToken"`
+	AuthToken    string `json:"authToken"`
+	OsName       string `json:"osName"`
+	OsVersion    string `json:"osVersion"`
+	IsMobile     bool   `json:"isMobile"`
+}
+
+type LogoutRequest struct {
+	ID string `json:"_id"`
+}
+
+type GetListUserRequest struct {
+	Page       int    `json:"page"`
+	Limit      int    `json:"limit"`
+	Status     string `json:"status"`
+	Type       string `json:"type"`
+	SupplierID string `json:"supplierId"`
+}
+
+type DetailUserRequest struct {
+	ID string `json:"_id"`
+}
+
 type CreateOwnerRequest struct {
 	Name       string `json:"name"`
 	Phone      string `json:"phone"`
 	Email      string `json:"email"`
 	SupplierID string `json:"supplierId"`
 	RoleID     string `json:"roleId"`
-	Password   string `json:"password"`
 }
 
 type UpdateOwnerRequest struct {
@@ -24,7 +56,6 @@ type CreateStaffRequest struct {
 	Email      string   `json:"email"`
 	SupplierID string   `json:"supplierId"`
 	RoleID     string   `json:"roleId"`
-	Password   string   `json:"password"`
 	Warehouses []string `json:"warehouses"`
 }
 
@@ -47,6 +78,10 @@ type UpdateStatusRequest struct {
 
 type ResetPasswordRequest struct {
 	ID string `json:"_id"`
+}
+
+type ChangePasswordRequest struct {
+	ID       string `json:"_id"`
 	Password string `json:"password"`
 }
 

model/supplier_user_response.go

@@ -1,5 +1,33 @@
 package model
 
+// LoginUserResponse ...
+type LoginUserResponse struct {
+	ID                      string `json:"_id"`
+	RequireToChangePassword bool   `json:"requireToChangePassword"`
+	SupplierID              string `json:"supplierId"`
+	Name                    string `json:"name"`
+}
+
+type GetListUserResponse struct {
+	SupplierUsers []SupplierUserBrief `json:"supplierUsers"`
+	Total         int64               `json:"total"`
+}
+
+type SupplierUserBrief struct {
+	ID         string      `json:"_id"`
+	Role       RoleShort   `json:"role"`
+	SupplierID string      `json:"supplierId"`
+	Name       string      `json:"name"`
+	Phone      string      `json:"phone"`
+	Email      string      `json:"email"`
+	Status     string      `json:"status"`
+	Avatar     interface{} `json:"avatar"`
+	Type       string      `json:"type"`
+	Warehouses []string    `json:"warehouses"`
+	CreatedAt  string      `json:"createdAt"`
+	UpdatedAt  string      `json:"updatedAt"`
+}
+
 type CreateOwnerResponse struct {
 	ID string `json:"_id"`
 }

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 ...
@@ -117,23 +115,7 @@ type WarehouseORUpdateDeliveryStatus struct {
 	DeliveryStatus string `json:"deliveryStatus"`
 }
 
-// UpdateStatusWarehousePendingInactiveRequest ...
+// UpdatePendingActiveProductRequest ...
-type UpdateStatusWarehousePendingInactiveRequest struct {
+type UpdatePendingActiveProductRequest struct {
-	Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"`
+	WarehouseIDs []string `json:"warehouseIDs"`
-}
-
-// 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 ...
@@ -131,6 +119,7 @@ type CommonLocation struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
 	Code int    `json:"code"`
+	Slug string `json:"slug"`
 }
 
 // ResponseLatLng ...
@@ -156,8 +145,6 @@ type WarehouseNatsResponse struct {
 	UpdatedAt             time.Time                 `json:"updatedAt"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 	IsPendingInactive     bool                      `json:"isPendingInactive"`
-	IsFromInternational   bool                      `json:"isFromInternational"`
-	StoreCode             string                    `json:"storeCode"`
 }
 
 // WarehouseInfo ...
@@ -186,9 +173,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"`
-}

model/withdraw_request.go

@@ -0,0 +1,5 @@
+package model
+
+type WithdrawSupplierCashReq struct {
+	SupplierID string `json:"supplierId"`
+}

model/withdraw_response.go

@@ -0,0 +1,7 @@
+package model
+
+type WithdrawSupplierCashRes struct {
+	PendingCash float64 `json:"pendingCash"`
+	SuccessCash float64 `json:"successCash"`
+	RejectCash  float64 `json:"rejectCash"`
+}

subject/auth_sms.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 {
+	// AuthSMS
+	CheckPermission string
+}{
+	// Users
+	CheckPermission: getAuthSMSValue("check_permission"),
+}

subject/bank.go

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

subject/config.go

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

subject/location.go

@@ -8,14 +8,13 @@ func getLocationValue(val string) string {
 
 var Location = struct {
 	GetLocationByCode         string
-	GetLocationByCodeFromLocationService   string
+	GetLocationByCodeNew      string
-	GetLocationByWardCode                  string
 	GetProvincesByCodes       string
-	GetProvincesByCodesFromLocationService string
+	GetProvincesByCodesNew    string
 	GetDistrictsByCodes       string
-	GetDistrictsByCodesFromLocationService string
+	GetDistrictsByCodesNew    string
 	GetWardsByCodes           string
-	GetWardsByCodesFromLocationService     string
+	GetWardsByCodesNew        string
 	GetProvinceByCondition    string
 	GetProvincesByCondition   string
 	GetDistrictByCondition    string
@@ -28,14 +27,13 @@ var Location = struct {
 	ProvinceDistinctWithField string
 }{
 	GetLocationByCode:         getLocationValue("get_location_warehouse"),
-	GetLocationByCodeFromLocationService:   getLocationValue("get_location_warehouse_from_location_service"),
+	GetLocationByCodeNew:      getLocationValue("get_location_warehouse_new"),
-	GetLocationByWardCode:                  getLocationValue("get_location_by_ward_code"),
 	GetProvincesByCodes:       getLocationValue("get_provinces_by_codes"),
-	GetProvincesByCodesFromLocationService: getLocationValue("get_provinces_by_codes_from_location_service"),
+	GetProvincesByCodesNew:    getLocationValue("get_provinces_by_codes_new"),
 	GetDistrictsByCodes:       getLocationValue("get_districts_by_codes"),
-	GetDistrictsByCodesFromLocationService: getLocationValue("get_districts_by_codes_from_location_service"),
+	GetDistrictsByCodesNew:    getLocationValue("get_districts_by_codes_new"),
 	GetWardsByCodes:           getLocationValue("get_wards_by_codes"),
-	GetWardsByCodesFromLocationService:     getLocationValue("get_wards_by_codes_from_location_service"),
+	GetWardsByCodesNew:        getLocationValue("get_wards_by_codes_new"),
 	GetProvinceByCondition:    getLocationValue("get_province_by_condition"),
 	GetProvincesByCondition:   getLocationValue("get_provinces_by_condition"),
 	GetDistrictByCondition:    getLocationValue("get_district_by_condition"),

subject/notification.go

@@ -0,0 +1,13 @@
+package subject
+
+import "fmt"
+
+func getNotificationValue(val string) string {
+	return fmt.Sprintf("%s.%s", prefixes.Notification, val)
+}
+
+var Notification = struct {
+	SupplierChangeBalanceRequestApproved string
+}{
+	SupplierChangeBalanceRequestApproved: getNotificationValue("supplier_change_balance_request_approved"),
+}

subject/order.go

@@ -8,18 +8,18 @@ func getOrderValue(val string) string {
 
 var Order = struct {
 	UpdateORStatus           string
-	GetUserTotalWarningOrders string
 	CancelDelivery           string
 	ChangeDeliveryStatus     string
 	UpdateLogisticInfoFailed string
 	ORNotUpdateStatus        string
 	GetSupplierOrders        string
+	GetSupplierCash          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"),
 	ORNotUpdateStatus:        getOrderValue("outbound_request_not_update_status"),
 	GetSupplierOrders:        getOrderValue("get_supplier_orders"),
+	GetSupplierCash:          getOrderValue("get_supplier_cash"),
 }

subject/product.go

@@ -9,18 +9,8 @@ func getProductValue(val string) string {
 
 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/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/supplier.go

@@ -11,6 +11,12 @@ var Supplier = struct {
 	GetDetailSupplierInfo           string
 	GetSupplierContractBySupplierID string
 	FindAll                         string
+	GetListWarehouseFreeShip        string
+	CreateCashflow                  string
+	DeleteCashflow                  string
+	UpdateBalance                   string
+	GetCurrentBalance               string
+	GetFreeShipInfo                 string
 	FindAllOld                      string
 	Count                           string
 }{
@@ -18,6 +24,12 @@ var Supplier = struct {
 	GetDetailSupplierInfo:           getSupplierValue("get_detail_supplier_info"),
 	GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
 	FindAll:                         getSupplierValue("find_all"),
+	GetListWarehouseFreeShip:        getSupplierValue("get_list_warehouse_free_ship"),
+	CreateCashflow:                  getSupplierValue("create_cashflow"),
+	DeleteCashflow:                  getSupplierValue("delete_cashflow"),
+	UpdateBalance:                   getSupplierValue("update_balance"),
+	GetCurrentBalance:               getSupplierValue("get_current_balance"),
+	GetFreeShipInfo:                 getSupplierValue("get_free_ship_info"),
 	FindAllOld:                      getSupplierValue("find_all_old"),
 	Count:                           getSupplierValue("count"),
 }

subject/supplier_permission.go

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

subject/supplier_role.go

@@ -7,9 +7,15 @@ func getRoleValue(val string) string {
 }
 
 var SupplierRole = struct {
+	GetList             string
+	Detail              string
 	Create              string
 	Update              string
+	GetListBySupplierID string
 }{
+	GetList:             getRoleValue("get_list"),
+	Detail:              getRoleValue("detail"),
 	Create:              getRoleValue("create"),
 	Update:              getRoleValue("update"),
+	GetListBySupplierID: getRoleValue("get_list_by_supplierId"),
 }

subject/supplier_user.go

@@ -8,20 +8,30 @@ func getSupplierUserValue(val string) string {
 
 var SupplierUser = struct {
 	// Users
+	LoginUser              string
+	Logout                 string
+	GetListUser            string
+	DetailUser             string
 	CreateOwner            string
 	UpdateOwner            string
 	CreateStaff            string
 	UpdateStaff            string
 	UpdateStatus           string
 	ResetPassword          string
+	ChangePassword         string
 	CheckTokenSupplierUser string
 }{
 	// Users
+	LoginUser:              getSupplierUserValue("login_user"),
+	Logout:                 getSupplierUserValue("logout"),
+	GetListUser:            getSupplierUserValue("get_list_user"),
+	DetailUser:             getSupplierUserValue("detail_user"),
 	CreateOwner:            getSupplierUserValue("create_owner"),
 	UpdateOwner:            getSupplierUserValue("update_owner"),
 	CreateStaff:            getSupplierUserValue("create_staff"),
 	UpdateStaff:            getSupplierUserValue("update_staff"),
 	UpdateStatus:           getSupplierUserValue("update_status"),
 	ResetPassword:          getSupplierUserValue("reset_password"),
+	ChangePassword:         getSupplierUserValue("change_password"),
 	CheckTokenSupplierUser: getSupplierUserValue("check_token_supplier_user"),
 }

subject/warehouse.go

@@ -9,6 +9,7 @@ func getWarehouseValue(val string) string {
 }
 
 var Warehouse = struct {
+	SyncWarehouseIntoServiceSupplier string
 	CreateWarehouseIntoServiceSupplier string
 	UpdateWarehouseIntoServiceSupplier string
 	CreateOutboundRequest              string
@@ -17,9 +18,9 @@ var Warehouse = struct {
 	GetConfiguration                   string
 	SyncORStatus                       string
 	WebhookTNC                         string
+	WebhookShiip                     string
 	WebhookGlobalCare                  string
 	WebhookOnPoint                     string
-	WebhookViettelFFM                    string
 	FindOne                            string
 	FindByCondition                    string
 	Distinct                           string
@@ -29,12 +30,9 @@ var Warehouse = struct {
 	UpdateIsClosedSupplier             string
 	GetWarehouses                      string
 	UpdateORDeliveryStatus             string
-	UpdateStatusWarehousePendingInactive string
+	UpdatePendingActiveProductByWarehouseIDs string
-	UpdateIsSellyMall                    string
-	UpdateWarehouseConfig                string
-	BulkWriteWarehouseConfig             string
-	GetListWarehouseConfig               string
 }{
+	SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
 	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
 	AfterCreateWarehouse:               getWarehouseValue("after_create_warehouse"),
@@ -45,9 +43,9 @@ var Warehouse = struct {
 	GetConfiguration:                   getWarehouseValue("get_configuration"),
 	SyncORStatus:                       getWarehouseValue("sync_or_status"),
 	WebhookTNC:                         getWarehouseValue("webhook_tnc"),
+	WebhookShiip:                     getWarehouseValue("webhook_shiip"),
 	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 +53,5 @@ 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"),
+	UpdatePendingActiveProductByWarehouseIDs: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
-	UpdateIsSellyMall:                    getWarehouseValue("update_is_selly_mall"),
-	UpdateWarehouseConfig:                getWarehouseValue("update_warehouse_config"),
-	BulkWriteWarehouseConfig:             getWarehouseValue("bulk_write_warehouse_config"),
-	GetListWarehouseConfig:               getWarehouseValue("get_list_warehouse_config"),
 }

subject/withdraw.go

@@ -0,0 +1,13 @@
+package subject
+
+import "fmt"
+
+func getWithdrawValue(val string) string {
+	return fmt.Sprintf("%s.%s", prefixes.Withdraw, val)
+}
+
+var Withdraw = struct {
+	GetSupplierCash string
+}{
+	GetSupplierCash: getWithdrawValue("get_supplier_cash"),
+}