Compare commits

...

84 Commits

Author SHA1 Message Date
QuanTT0110 72aaea5b87 fix get bank info 2022-10-27 11:58:19 +07:00
QuanTT0110 389a26ad6f fix get bank info 2022-10-27 11:30:17 +07:00
QuanTT0110 33bc508f1f get bank and branches by bank ids 2022-10-27 09:37:07 +07:00
QuanTT0110 dcbf82a4d0 Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into feature/get-freeship-by-supplierids 2022-10-25 12:00:45 +07:00
QuanTT0110 27b14aa122 get freeships by supplier ids 2022-10-25 12:00:37 +07:00
trunglt251292 5dbde84ea9 Merge branch 'move-config-suppliers' of git.selly.red:Selly-Modules/natsio into develop 2022-10-24 10:56:03 +07:00
Minh Nguyen e35090e490 Merge pull request 'rerun' (#48) from feature/seller-add-field-planPackage into develop
Reviewed-on: #48
2022-10-24 03:07:44 +00:00
Nguyen Minh b35a018d0a rerun 2022-10-24 10:07:14 +07:00
QuanTT0110 f0eb62f3f5 get list permission authsms 2022-10-21 11:49:48 +07:00
Sinh b5fe2c5a71 Merge branch 'integrate-onpoint' into develop 2022-10-21 09:27:07 +07:00
Sinh 4bc7195563 update OR payload 2022-10-21 09:26:37 +07:00
Tue 2b890e01ef Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:18:00 +07:00
Tue 25cb392d93 update auth sms 2022-10-20 15:17:50 +07:00
Tue a6f9f9eac7 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:10:50 +07:00
Tue 546592f8ce update auth sms 2022-10-20 15:10:42 +07:00
Tue d2874bc681 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 14:40:39 +07:00
Tue 9297f2d9bd update auth sms 2022-10-20 14:39:41 +07:00
Tue 87158679a7 update auth sms 2022-10-20 14:32:32 +07:00
Sinh f3ef44279b Merge branch 'integrate-onpoint' into develop 2022-10-18 15:05:12 +07:00
Sinh 91d8ffe40f add warehouse client method 2022-10-18 14:57:14 +07:00
Sinh aa9471590d Merge branch 'add-queue-subscribe' into integrate-onpoint 2022-10-18 11:55:54 +07:00
Sinh e0ecb83b9e Merge branch 'add-queue-subscribe' into develop 2022-10-18 11:55:46 +07:00
Sinh dac9add5fb add queue subscribe json encoder 2022-10-18 11:55:33 +07:00
Sinh ae36115495 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into integrate-onpoint 2022-10-18 11:50:08 +07:00
Sinh 9c9ed32d58 Merge branch 'add-queue-subscribe' into develop 2022-10-18 11:47:24 +07:00
Minh Nguyen f6386332de Merge pull request 'get list warehouse freeship' (#46) from feature/get-list-warehouse-freeship into develop
Reviewed-on: #46
2022-10-17 08:13:42 +00:00
QuanTT0110 b7d963cc90 get list warehouse freeship 2022-10-17 15:09:50 +07:00
Sinh 65fe4d8380 Merge branch 'integrate-onpoint' into develop 2022-10-17 14:44:25 +07:00
Sinh 22396d8f40 update nats payload 2022-10-17 14:32:14 +07:00
Sinh 8d571022fc Merge branch 'integrate-onpoint' into develop 2022-10-17 11:25:33 +07:00
Sinh 722fa1aacf Merge branch 'update-payload' into develop 2022-10-17 11:24:30 +07:00
Sinh 45291bf323 Merge branch 'master' into integrate-onpoint 2022-10-13 16:49:32 +07:00
quang1472001 d71d7f0eb4 [location] add Keyword to WardRequestCondition struct 2022-10-13 10:23:11 +07:00
Tue af44ea63f4 fix warehouse 2022-10-12 11:38:54 +07:00
Tue c7ad6baf4c Merge branch 'feature/get-bank-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-11 14:02:55 +07:00
Minh Nguyen 539aa79128
Merge pull request #41 from Selly-Modules/feature/seller-add-field-planPackage
seller-add-field-planPackage
2022-10-10 09:06:46 +07:00
Nguyen Minh 42874f4937 seller-add-field-planPackage 2022-10-10 09:06:20 +07:00
quang1472001 ed0f16623a add old slug to location response struct 2022-10-07 15:23:02 +07:00
quang1472001 3e13cb55b3 update location request condition 2022-10-06 11:22:10 +07:00
quang1472001 cebb3214cf update location add slug & DistinctWithField 2022-10-06 10:55:49 +07:00
quang1472001 b9b55d144e update fix GetDistrictByCondition 2022-10-06 10:20:47 +07:00
quang1472001 29b2b861ff update location add find by slug 2022-10-06 09:19:21 +07:00
quang1472001 a86a097886 update location 2022-10-05 18:15:36 +07:00
quang1472001 863e924a5e update location 2022-10-05 18:12:42 +07:00
quang1472001 7a3e50ef97 update location 2022-10-05 17:59:44 +07:00
Sinh 1b89d5f368 update onpoint payload 2022-10-05 09:19:54 +07:00
Sinh 86845399e3 update onpoint payload 2022-10-05 09:15:36 +07:00
Sinh 13a465b627 Merge branch 'integrate-onpoint' into develop 2022-10-04 15:47:25 +07:00
Sinh baf8a98e35 Merge branch 'master' of github.com:Selly-Modules/natsio into integrate-onpoint 2022-10-04 15:33:53 +07:00
Sinh 7f57a9bd97 Merge branch 'export-warehouse-data' into develop 2022-09-30 10:41:46 +07:00
trunglt251292 8fe3b39134 Merge branch 'feature/seller-by-id' of github.com:Selly-Modules/natsio into develop 2022-09-30 10:29:50 +07:00
Sinh 68146c7c2a Merge branch 'integrate-onpoint' into develop 2022-09-28 09:37:32 +07:00
Sinh 439d1a0d5a Merge branch 'global-care-car-insurance' into develop 2022-09-28 09:33:32 +07:00
Minh Nguyen ed564effe6
Merge pull request #36 from Selly-Modules/feature/seller-by-id
js cashflow seller
2022-09-23 23:33:01 +07:00
Minh Nguyen c2acdaf244
Merge pull request #35 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-23 22:12:04 +07:00
Minh Nguyen 40e5219036
Merge pull request #34 from Selly-Modules/feature/seller-by-id
update js stream
2022-09-23 14:47:28 +07:00
Minh Nguyen df9ccf9d69
Merge pull request #33 from Selly-Modules/feature/seller-by-id
stream name
2022-09-23 11:58:12 +07:00
Minh Nguyen e61ae3c10d
Merge pull request #32 from Selly-Modules/feature/seller-by-id
jestream
2022-09-23 11:17:31 +07:00
Nguyen Minh 36ad0b4972 Merge branch 'feature/seller-by-id' into develop 2022-09-23 10:14:24 +07:00
quang1472001 d7c0138d6a Merge branch 'develop' of github.com:Selly-Modules/natsio into develop 2022-09-22 15:18:06 +07:00
quang1472001 021df099cc update location 2022-09-22 14:56:31 +07:00
Minh Nguyen 08a9fdabe0
Merge pull request #30 from Selly-Modules/feature/seller-by-id
support chat get seller info
2022-09-22 13:49:48 +07:00
Sinh d06719b0e6 define api get supplier orders 2022-09-22 09:34:16 +07:00
Sinh 73181bc583 add order func 2022-09-21 17:40:49 +07:00
Tue 6b168cd98a bank info 2022-09-21 14:06:59 +07:00
Minh Nguyen 4a5adc610e
Merge pull request #28 from Selly-Modules/feature/seller-by-id
get seller info support chat
2022-09-21 10:19:57 +07:00
trunglt251292 a9cc99994f Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 14:47:19 +07:00
trunglt251292 6bd4ebce2e Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 13:50:25 +07:00
trunglt251292 3c5c95b103 [Update] 2022-09-20 10:56:45 +07:00
trunglt251292 a261c32dc4 Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 10:29:13 +07:00
Sinh fa5be3e17c Merge branch 'integrate-onpoint' into develop 2022-09-19 15:02:07 +07:00
Sinh 9e4e6868a4 add warehouse subject 2022-09-19 15:01:54 +07:00
anbuiselly c449dd44f1
Merge pull request #27 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 14:54:08 +07:00
Sinh af85d25516 Merge branch 'integrate-onpoint' into develop 2022-09-19 14:19:07 +07:00
Sinh b5ba7c7bf1 update OR nats model 2022-09-19 14:18:51 +07:00
Minh Nguyen 389507050a
Merge pull request #25 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 11:51:05 +07:00
Sinh 86269e4292 Merge branch 'integrate-onpoint' into develop 2022-09-19 11:10:46 +07:00
Sinh 48e585dc16 update OR request model 2022-09-19 11:10:23 +07:00
Tue 22cd1eb18f bank info 2022-09-17 10:59:30 +07:00
Tue 44f0e4be44 bank info 2022-09-17 10:55:37 +07:00
trunglt251292 ddc0af6338 Merge branch 'selly-food' of github.com:Selly-Modules/natsio into develop 2022-09-16 15:36:57 +07:00
trunglt251292 5f5bfeb182 fix conflict 2022-09-16 14:52:01 +07:00
Nguyen Minh 139dc6a865 Fix conflict 2022-09-15 17:04:26 +07:00
Tue 4546d0e89b add bank branch info 2022-09-15 11:20:34 +07:00
30 changed files with 795 additions and 220 deletions

60
client/authsms.go Normal file
View File

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

View File

@ -17,14 +17,15 @@ func GetBank() Bank {
return Bank{}
}
func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID))
// GetBankInfo ...
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

View File

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

View File

@ -28,7 +28,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
Data *model.ResponseLocationAddress `json:"data"`
Error string `json:"error"`
}
if err := json.Unmarshal(msg.Data, &r); err != nil {
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
@ -38,7 +38,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
return r.Data, nil
}
// GetProvincesByCodes ... ...
// GetProvincesByCodes ...
func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodes, toBytes(p))
if err != nil {
@ -46,11 +46,11 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo
}
var r struct {
Data *model.LocationProvinceResponse `json:"data"'`
Data *model.LocationProvinceResponse `json:"data"`
Error string `json:"error"`
}
if err := json.Unmarshal(msg.Data, &r); err != nil {
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
@ -71,7 +71,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
Error string `json:"error"`
}
if err := json.Unmarshal(msg.Data, &r); err != nil {
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
@ -94,7 +94,7 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
Error string `json:"error"`
}
if err := json.Unmarshal(msg.Data, &r); err != nil {
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
@ -104,3 +104,211 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
return r.Data, nil
}
// GetProvinceByCondition ...
func (l Location) GetProvinceByCondition(p model.ProvinceRequestCondition) (*model.LocationProvinceDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvinceByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationProvinceDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetProvincesByCondition ...
func (l Location) GetProvincesByCondition(p model.ProvinceRequestCondition) ([]*model.LocationProvinceDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationProvinceDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetDistrictByCondition ...
func (l Location) GetDistrictByCondition(p model.DistrictRequestCondition) (*model.LocationDistrictDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationDistrictDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetDistrictsByCondition ...
func (l Location) GetDistrictsByCondition(p model.DistrictRequestCondition) ([]*model.LocationDistrictDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationDistrictDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetWardByCondition ...
func (l Location) GetWardByCondition(p model.WardRequestCondition) (*model.LocationWardDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetWardByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationWardDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetWardsByCondition ...
func (l Location) GetWardsByCondition(p model.WardRequestCondition) ([]*model.LocationWardDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationWardDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// CountProvinceByCondition ...
func (l Location) CountProvinceByCondition(p model.ProvinceRequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountProvinceByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// CountDistrictByCondition ...
func (l Location) CountDistrictByCondition(p model.DistrictRequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountDistrictByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// CountWardByCondition ...
func (l Location) CountWardByCondition(p model.WardRequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountWardByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// DistinctWithField ...
func (l Location) DistinctWithField(p model.ProvinceDistinctWithField) ([]interface{}, error) {
msg, err := natsio.GetServer().Request(subject.Location.ProvinceDistinctWithField, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []interface{} `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

View File

@ -98,3 +98,24 @@ func (o Order) ORNotUpdateStatus(p model.OrderORsNotUpdateStatus) error {
}
return nil
}
// GetSupplierOrders ...
func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrderList, error) {
msg, err := natsio.GetServer().Request(subject.Order.GetSupplierOrders, toBytes(p))
if err != nil {
return nil, err
}
var (
r struct {
Data model.SupplierOrderList `json:"data"`
Error string `json:"error"`
}
)
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return &r.Data, nil
}

View File

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

View File

@ -3,6 +3,7 @@ package client
import (
"encoding/json"
"errors"
"go.mongodb.org/mongo-driver/bson"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
@ -80,27 +81,6 @@ func (s Supplier) FindAll(supplierID model.SupplierRequestPayload) (*model.Suppl
return r.Data, nil
}
func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*model.SupplierAll, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.FindAll, toBytes(supplierID))
if err != nil {
return nil, err
}
var r struct {
Data *model.SupplierAll `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// CreateWarehouseIntoServiceSupplier ...
func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error {
msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p))
@ -136,3 +116,44 @@ func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWareh
}
return nil
}
// GetWarehouseFreeship ...
func (s Supplier) GetWarehouseFreeship() (*model.ResponseListWarehouseIDByBusinessType, error) {
msg, err := natsio.GetServer().Request(subject.Selly.GetListWarehouseFreeship, toBytes(bson.M{}))
if err != nil {
return nil, err
}
var r struct {
Data *model.ResponseListWarehouseIDByBusinessType `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetFreeshipsBySupplierIDs ...
func (s Supplier) GetFreeshipsBySupplierIDs(p model.GetFreeshipsBySupplierIds) (*model.ResponseListFreeshipsBySupplierIds, error) {
msg, err := natsio.GetServer().Request(subject.Selly.GetFreeshipsBySupplierIds, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.ResponseListFreeshipsBySupplierIds `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

View File

@ -3,6 +3,7 @@ package client
import (
"encoding/json"
"errors"
"fmt"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
@ -163,3 +164,21 @@ func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWareho
}
return r.Data, nil
}
// UpdateORDeliveryStatus ...
func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatus) error {
msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
if err != nil {
return err
}
var r struct {
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return fmt.Errorf("nats: update_or_delivery_status %v", err)
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

View File

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

10
model/authsms_request.go Normal file
View File

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

View File

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

View File

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

View File

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

11
model/bank_request.go Normal file
View File

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

View File

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

View File

@ -1,23 +1,65 @@
package model
// LocationRequestPayload ...
type LocationRequestPayload struct {
type (
LocationRequestPayload struct {
Province int `json:"province"`
District int `json:"district"`
Ward int `json:"ward"`
}
// ProvinceRequestPayload ...
type ProvinceRequestPayload struct {
ProvinceRequestPayload struct {
Codes []int `json:"codes"`
}
// ProvinceRequestCondition ...
ProvinceRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
Slug string `json:"slug"`
Slugs []string `json:"slugs"`
Keyword string `json:"keyword"`
Region string `json:"region"`
}
// DistrictRequestPayload ...
type DistrictRequestPayload struct {
DistrictRequestPayload struct {
Codes []int `json:"codes"`
}
// DistrictRequestCondition ...
DistrictRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
ProvinceCode int `json:"provinceCode"`
Slug string `json:"slug"`
ProvinceSlug string `json:"provinceSlug"`
Keyword string `json:"keyword"`
}
// WardRequestPayload ...
type WardRequestPayload struct {
WardRequestPayload struct {
Codes []int `json:"codes"`
}
// WardRequestCondition ...
WardRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
DistrictCode int `json:"districtCode"`
ProvinceCode int `json:"provinceCode"`
Slug string `json:"slug"`
DistrictSlug string `json:"districtSlug"`
ProvinceSlug string `json:"provinceSlug"`
Keyword string `json:"keyword"`
}
// ProvinceDistinctWithField ...
ProvinceDistinctWithField struct {
Conditions struct {
Region string `json:"region"`
} `json:"conditions"`
Field string `json:"filed"`
}
)

View File

@ -1,43 +1,96 @@
package model
type ResponseLocationAddress struct {
import "time"
type (
// ResponseLocationAddress ...
ResponseLocationAddress struct {
Province LocationProvince `json:"province"`
District LocationDistrict `json:"district"`
Ward LocationWard `json:"ward"`
}
// LocationProvince ...
type LocationProvince struct {
LocationProvince struct {
ID string `json:"id"`
Name string `json:"name"`
Code int `json:"code"`
RegionCode string `json:"regionCode"`
MainRegionCode string `json:"mainRegionCode"`
}
// LocationDistrict ...
type LocationDistrict struct {
LocationDistrict struct {
ID string `json:"id"`
Name string `json:"name"`
Code int `json:"code"`
}
// LocationWard ...
type LocationWard struct {
LocationWard struct {
ID string `json:"id"`
Name string `json:"name"`
Code int `json:"code"`
}
// LocationProvinceResponse ...
type LocationProvinceResponse struct {
LocationProvinceResponse struct {
Provinces []LocationProvince `json:"provinces"`
}
// LocationDistrictResponse ...
type LocationDistrictResponse struct {
LocationDistrictResponse struct {
Districts []LocationDistrict `json:"districts"`
}
// LocationWardResponse ...
type LocationWardResponse struct {
LocationWardResponse struct {
Wards []LocationWard `json:"wards"`
}
// LocationProvinceDetailResponse ...
LocationProvinceDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
SearchString string `json:"searchString"`
Slug string `json:"slug"`
OldSlug string `json:"oldSlug"`
Code int `json:"code"`
CountryCode string `json:"countryCode"`
RegionCode string `json:"regionCode"`
MainRegionCode string `json:"mainRegionCode"`
TotalDistricts int `json:"totalDistricts"`
TotalWards int `json:"totalWards"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
// LocationDistrictDetailResponse ...
LocationDistrictDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
SearchString string `json:"searchString"`
Slug string `json:"slug"`
OldSlug string `json:"oldSlug"`
Code int `json:"code"`
ProvinceCode int `json:"provinceCode"`
Area int `json:"area"`
TotalWards int `json:"totalWards"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
// LocationWardDetailResponse ...
LocationWardDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
SearchString string `json:"searchString"`
Slug string `json:"slug"`
OldSlugs []string `json:"oldSlugs"`
Code int `json:"code"`
DistrictCode int `json:"districtCode"`
ProvinceCode int `json:"provinceCode"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
)

View File

@ -2,6 +2,7 @@ package model
// OrderUpdateORStatus ...
type OrderUpdateORStatus struct {
ID string `json:"id"`
OrderCode string `json:"orderCode"`
ORCode string `json:"orCode"`
Status string `json:"status"`
@ -38,3 +39,13 @@ type OrderUpdateLogisticInfoFailed struct {
type OrderORsNotUpdateStatus struct {
ORCodes []string `json:"orCodes"`
}
// OrderSupplierQuery ...
type OrderSupplierQuery struct {
Limit int64 `json:"limit"`
Page int64 `json:"page"`
FromDate string `json:"fromDate"`
ToDate string `json:"toDate"`
SupplierID string `json:"supplierId"`
WarehouseIDs []string `json:"warehouseIDs"`
}

35
model/order_response.go Normal file
View File

@ -0,0 +1,35 @@
package model
import "time"
// SupplierOrderList ...
type SupplierOrderList struct {
List []SupplierOrder `json:"list"`
Total int64 `json:"total" example:"100"`
Limit int64 `json:"limit" example:"20"`
}
// SupplierOrder ...
type SupplierOrder struct {
ID string `json:"_id"`
Code string `json:"code"`
CreatedAt time.Time `json:"createdAt"`
Status string `json:"status"`
WarehouseStatus string `json:"warehouseStatus"`
Items []SupplierOrderItem `json:"items"`
Delivery SupplierOrderDelivery `json:"delivery"`
}
// SupplierOrderItem ...
type SupplierOrderItem struct {
ID string `json:"_id" example:"1231"`
SupplierSKU string `json:"supplierSku" example:"SUPPLIER_SKU"`
Quantity int64 `json:"quantity" example:"2"`
}
// SupplierOrderDelivery ...
type SupplierOrderDelivery struct {
Code string `json:"code" example:"123187287"`
Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
}

View File

@ -31,6 +31,15 @@ type ResponseSellerInfoSupportChat struct {
TrackingTime *SellerTrackingTime `json:"trackingTime"`
Invitee *InviteeInfo `json:"invitee"`
CreatedAt time.Time `json:"createdAt"`
PlanPackage *SellerPlanPackageInfo `json:"planPackage"`
}
// SellerPlanPackageInfo ...
type SellerPlanPackageInfo struct {
ID string `json:"_id"`
Name string `json:"name"`
Level int `json:"level"`
CreatedAt time.Time `json:"createdAt"`
}
// SellerTrackingTime ...

View File

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

View File

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

View File

@ -13,6 +13,7 @@ type OutboundRequestPayload struct {
Customer CustomerInfo `json:"customer"`
Items []OutboundRequestItem `json:"items"`
Insurance *InsuranceOpts `json:"insurance"`
PaymentMethod string `json:"paymentMethod"`
}
// InsuranceOpts ...
@ -39,6 +40,8 @@ type OutboundRequestItem struct {
SupplierSKU string `json:"supplierSKU"`
Quantity int64 `json:"quantity"`
UnitCode string `json:"unitCode"`
Price float64 `json:"price"`
Name string `json:"name"`
}
// CustomerInfo ...
@ -63,11 +66,14 @@ type UpdateOutboundRequestLogisticInfoPayload struct {
ShippingLabel string `json:"shippingLabel"`
TrackingCode string `json:"trackingCode"`
ORCode string `json:"orCode"`
TPLCode string `json:"tplCode"`
OrderID string `json:"orderId"`
}
// CancelOutboundRequest ...
type CancelOutboundRequest struct {
ORCode string `json:"orCode"`
OrderID string `json:"orderId"`
Note string `json:"note"`
}
@ -75,6 +81,7 @@ type CancelOutboundRequest struct {
type SyncORStatusRequest struct {
ORCode string `json:"orCode"`
OrderCode string `json:"orderCode"`
OrderID string `json:"orderId"`
}
// UpdateSupplierIsClosedRequest ...
@ -98,3 +105,11 @@ type GetWarehousesRequest struct {
Page int64 `json:"page"`
Limit int64 `json:"limit"`
}
// WarehouseORUpdateDeliveryStatus ...
type WarehouseORUpdateDeliveryStatus struct {
ORCode string `json:"orCode"`
OrderCode string `json:"orderCode"`
OrderID string `json:"orderId"`
DeliveryStatus string `json:"deliveryStatus"`
}

15
subject/authsms.go Normal file
View File

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

View File

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

View File

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

View File

@ -11,9 +11,29 @@ var Location = struct {
GetProvincesByCodes string
GetDistrictsByCodes string
GetWardsByCodes string
GetProvinceByCondition string
GetProvincesByCondition string
GetDistrictByCondition string
GetDistrictsByCondition string
GetWardByCondition string
GetWardsByCondition string
CountProvinceByCondition string
CountDistrictByCondition string
CountWardByCondition string
ProvinceDistinctWithField string
}{
GetLocationByCode: getLocationValue("get_location_warehouse"),
GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
GetWardsByCodes: getLocationValue("get_wards_by_codes"),
GetProvinceByCondition: getLocationValue("get_province_by_condition"),
GetProvincesByCondition: getLocationValue("get_provinces_by_condition"),
GetDistrictByCondition: getLocationValue("get_district_by_condition"),
GetDistrictsByCondition: getLocationValue("get_districts_byCondition"),
GetWardByCondition: getLocationValue("get_ward_by_condition"),
GetWardsByCondition: getLocationValue("get_wards_by_condition"),
CountProvinceByCondition: getLocationValue("count_province_by_condition"),
CountDistrictByCondition: getLocationValue("count_district_by_condition"),
CountWardByCondition: getLocationValue("count_ward_by_condition"),
ProvinceDistinctWithField: getLocationValue("province_distinct_with_field"),
}

View File

@ -12,10 +12,12 @@ var Order = struct {
ChangeDeliveryStatus string
UpdateLogisticInfoFailed string
ORNotUpdateStatus string
GetSupplierOrders string
}{
UpdateORStatus: getOrderValue("update_outbound_request_status"),
CancelDelivery: getOrderValue("cancel_delivery"),
ChangeDeliveryStatus: getOrderValue("change_delivery_status"),
UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"),
GetSupplierOrders: getOrderValue("get_supplier_orders"),
}

15
subject/selly.go Normal file
View File

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

View File

@ -16,6 +16,7 @@ var Warehouse = struct {
SyncORStatus string
WebhookTNC string
WebhookGlobalCare string
WebhookOnPoint string
FindOne string
FindByCondition string
Distinct string
@ -24,6 +25,7 @@ var Warehouse = struct {
AfterCreateWarehouse string
UpdateIsClosedSupplier string
GetWarehouses string
UpdateORDeliveryStatus string
}{
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
@ -36,10 +38,12 @@ var Warehouse = struct {
SyncORStatus: getWarehouseValue("sync_or_status"),
WebhookTNC: getWarehouseValue("webhook_tnc"),
WebhookGlobalCare: getWarehouseValue("webhook_global_care"),
WebhookOnPoint: getWarehouseValue("webhook_on_point"),
FindOne: getWarehouseValue("find_one"),
FindByCondition: getWarehouseValue("find_all_by_condition"),
Distinct: getWarehouseValue("distinct"),
Count: getWarehouseValue("count"),
UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"),
GetWarehouses: getWarehouseValue("get_warehouses"),
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
}