refactor-location #134
|
@ -17,15 +17,15 @@ func GetBank() Bank {
|
||||||
return Bank{}
|
return Bank{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
|
func (s Bank) GetBankAndBranchByBankIDs(p model.GetBankAndBranchesRequest) ([]*model.ResponseBankAndBranches, error) {
|
||||||
msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID))
|
msg, err := natsio.GetServer().Request(subject.Bank.GetBankAndBranchesByBankIDs, toBytes(p))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var r struct {
|
var r struct {
|
||||||
Data *model.BankBrief `json:"data"`
|
Data []*model.ResponseBankAndBranches `json:"data"`
|
||||||
Error string `json:"error"`
|
Error string `json:"error"`
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||||
|
@ -38,7 +38,7 @@ func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
|
||||||
return r.Data, nil
|
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))
|
msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
|
|
@ -119,7 +119,7 @@ func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWareh
|
||||||
|
|
||||||
// GetWarehouseFreeship ...
|
// GetWarehouseFreeship ...
|
||||||
func (s Supplier) GetWarehouseFreeship() (*model.ResponseListWarehouseIDByBusinessType, error) {
|
func (s Supplier) GetWarehouseFreeship() (*model.ResponseListWarehouseIDByBusinessType, error) {
|
||||||
msg, err := natsio.GetServer().Request(subject.Supplier.GetListWarehouseFreeship, toBytes(bson.M{}))
|
msg, err := natsio.GetServer().Request(subject.Selly.GetListWarehouseFreeship, toBytes(bson.M{}))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -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"`
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
package model
|
|
||||||
|
|
||||||
type BankBranchRequest struct {
|
|
||||||
BankID string `json:"bankId"`
|
|
||||||
BranchID string `json:"branchId"`
|
|
||||||
}
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
package model
|
||||||
|
|
||||||
|
type CheckBankAndBranchByIDRequest struct {
|
||||||
|
BankID string `json:"bankId"`
|
||||||
|
BranchID string `json:"branchId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetBankAndBranchesRequest struct {
|
||||||
|
BankIDs []string `json:"bankIds"`
|
||||||
|
}
|
|
@ -1,21 +1,40 @@
|
||||||
package model
|
package model
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
// MultiLang ...
|
// MultiLang ...
|
||||||
type MultiLang struct {
|
type MultiLang struct {
|
||||||
En string `json:"en"`
|
En string `json:"en"`
|
||||||
Vi string `json:"vi"`
|
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 ...
|
// BankBrief ...
|
||||||
type BankBrief struct {
|
type BankBrief struct {
|
||||||
ID string `json:"_id"`
|
ID string `json:"_id"`
|
||||||
Name MultiLang `json:"name"`
|
Name MultiLang `json:"name"`
|
||||||
ShortName string `json:"shortName"`
|
ShortName string `json:"shortName"`
|
||||||
Active bool `json:"active"`
|
Active bool `json:"active"`
|
||||||
BenBankName string `json:"benBankName"`
|
BenBankName string `json:"benBankName"`
|
||||||
BankCode int `json:"bankCode"`
|
BankCode int `json:"bankCode"`
|
||||||
IsBranchRequired bool `json:"isBranchRequired"`
|
IsBranchRequired bool `json:"isBranchRequired"`
|
||||||
SearchString string `json:"searchString"`
|
BeneficiaryForVietinbank string `json:"beneficiaryForVietinbank"`
|
||||||
BeneficiaryForVietinbank string `json:"beneficiaryForVietinbank"`
|
CreatedBy string `json:"createdBy,omitempty"`
|
||||||
CreatedBy string `json:"createdBy,omitempty"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
|
BranchTotal int64 `json:"branchTotal"`
|
||||||
|
Logo interface{} `json:"logo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ResponseBankAndBranches struct {
|
||||||
|
Bank BankBrief `json:"bank"`
|
||||||
|
Branches []BranchBrief `json:"branches"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,11 +7,9 @@ func getBankValue(val string) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
var Bank = struct {
|
var Bank = struct {
|
||||||
GetBankById string
|
GetBankAndBranchesByBankIDs string
|
||||||
GetBankBranchById string
|
CheckBankAndBranchByID string
|
||||||
CheckBankAndBranchByID string
|
|
||||||
}{
|
}{
|
||||||
GetBankById: getBankValue("get_bank_by_id"),
|
GetBankAndBranchesByBankIDs: getBankValue("get_bank_and_branches_by_bank_ids"),
|
||||||
GetBankBranchById: getBankValue("get_bank_branch_by_id"),
|
CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
|
||||||
CheckBankAndBranchByID: getBankValue("check_bank_and_brach_by_id"),
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@ func getSellyValue(val string) string {
|
||||||
|
|
||||||
var Selly = struct {
|
var Selly = struct {
|
||||||
GetFreeshipsBySupplierIds string
|
GetFreeshipsBySupplierIds string
|
||||||
|
GetListWarehouseFreeship string
|
||||||
}{
|
}{
|
||||||
GetFreeshipsBySupplierIds: getSellyValue("get_freeships_by_supplier_ids"),
|
GetFreeshipsBySupplierIds: getSellyValue("get_freeships_by_supplier_ids"),
|
||||||
|
GetListWarehouseFreeship: getSupplierValue("get_list_warehouse_freeship"),
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,8 @@ var Supplier = struct {
|
||||||
GetListSupplierInfo string
|
GetListSupplierInfo string
|
||||||
GetSupplierContractBySupplierID string
|
GetSupplierContractBySupplierID string
|
||||||
FindAll string
|
FindAll string
|
||||||
GetListWarehouseFreeship string
|
|
||||||
}{
|
}{
|
||||||
GetListSupplierInfo: getSupplierValue("get_list_supplier_info"),
|
GetListSupplierInfo: getSupplierValue("get_list_supplier_info"),
|
||||||
GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
|
GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
|
||||||
FindAll: getSupplierValue("find_all"),
|
FindAll: getSupplierValue("find_all"),
|
||||||
GetListWarehouseFreeship: getSupplierValue("get_list_warehouse_freeship"),
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue