liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed bug in GetStoreVendorMaps

Browse Source
This commit is contained in:
gazebo
2018-09-09 12:46:21 +08:00
parent fc05f326b7
commit d312a672fc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/store.go
View File

@@ -239,7 +239,7 @@ func CreateStore(store *model.Store, userName string) (id int, err error) {
}
func SyncStore2Vendor(db *dao.DaoDB, vendorID int, store *model.Store, isForce bool, userName string) (err error) {
storeMaps, err := GetStoreVendorMaps(db, store.ID)
storeMaps, err := GetStoreVendorMaps(db, store.ID, -1)
if err == nil {
// globals.SugarLogger.Debug(utils.Format4Output(store, false))
for _, storeMap := range storeMaps {
@@ -254,8 +254,12 @@ func SyncStore2Vendor(db *dao.DaoDB, vendorID int, store *model.Store, isForce b
return err
}
func GetStoreVendorMaps(db *dao.DaoDB, storeID int) (storeMaps []*model.StoreMap, err error) {
err = dao.GetRows(db, &storeMaps, "SELECT * FROM store_map WHERE store_id = ?", storeID)
func GetStoreVendorMaps(db *dao.DaoDB, storeID int, vendorID int) (storeMaps []*model.StoreMap, err error) {
if vendorID == -1 {
err = dao.GetRows(db, &storeMaps, "SELECT * FROM store_map WHERE store_id = ?", storeID)
} else {
err = dao.GetRows(db, &storeMaps, "SELECT * FROM store_map WHERE store_id = ? AND vendor_id = ?", storeID, vendorID)
}
return storeMaps, err
}

5
controllers/cms_store.go
View File

@@ -168,7 +168,10 @@ func (c *StoreController) ZZZZZ() {
// @router /GetStoreVendorMaps [get]
func (c *StoreController) GetStoreVendorMaps() {
c.callGetStoreVendorMaps(func(params *tStoreGetStoreVendorMapsParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetStoreVendorMaps(nil, params.StoreID)
if c.GetString("vendorID") == "" {
params.VendorID = -1
}
retVal, err = cms.GetStoreVendorMaps(nil, params.StoreID, params.VendorID)
return retVal, "", err
})
}