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

- fix bug when not use Unmarshal2Map correctly

Browse Source
This commit is contained in:
gazebo
2019-01-31 11:58:15 +08:00
parent b6f7921b76
commit 7a5326a1dc
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/cms_sku.go
View File

@@ -183,8 +183,9 @@ func (c *SkuController) AddSkuName() {
// @router /UpdateSkuName [put]
func (c *SkuController) UpdateSkuName() {
c.callUpdateSkuName(func(params *tSkuUpdateSkuNameParams) (retVal interface{}, errCode string, err error) {
payload := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil {
var payload map[string]interface{}
dummySkuName := &model.SkuName{}
if payload, err = utils.Unmarshal2Map([]byte(params.Payload), dummySkuName); err == nil {
retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
@@ -233,8 +234,9 @@ func (c *SkuController) AddSku() {
// @router /UpdateSku [put]
func (c *SkuController) UpdateSku() {
c.callUpdateSku(func(params *tSkuUpdateSkuParams) (retVal interface{}, errCode string, err error) {
payload := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil {
var payload map[string]interface{}
dummySku := &model.Sku{}
if payload, err = utils.Unmarshal2Map([]byte(params.Payload), dummySku); err == nil {
retVal, err = cms.UpdateSku(params.Ctx, params.SkuID, payload, params.Ctx.GetUserName())
}
return retVal, "", err

15
controllers/cms_store.go
View File

@@ -66,9 +66,10 @@ func (c *StoreController) GetVendorStore() {
// @router /UpdateStore [put]
func (c *StoreController) UpdateStore() {
c.callUpdateStore(func(params *tStoreUpdateStoreParams) (retVal interface{}, errCode string, err error) {
store := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &store); err == nil {
retVal, err = cms.UpdateStore(params.Ctx, params.StoreID, store, params.Ctx.GetUserName())
var payload map[string]interface{}
dummyStore := &model.Store{}
if payload, err = utils.Unmarshal2Map([]byte(params.Payload), dummyStore); err == nil {
retVal, err = cms.UpdateStore(params.Ctx, params.StoreID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -144,10 +145,10 @@ func (c *StoreController) GetStoreVendorMaps() {
// @router /UpdateStoreVendorMap [put]
func (c *StoreController) UpdateStoreVendorMap() {
c.callUpdateStoreVendorMap(func(params *tStoreUpdateStoreVendorMapParams) (retVal interface{}, errCode string, err error) {
var storeMap map[string]interface{}
var storeMapStruct model.StoreMap
if storeMap, err = utils.Unmarshal2Map([]byte(params.Payload), &storeMapStruct); err == nil {
retVal, err = cms.UpdateStoreVendorMap(params.Ctx, nil, params.StoreID, params.VendorID, storeMap, params.Ctx.GetUserName())
var payload map[string]interface{}
dummyStoreMap := &model.StoreMap{}
if payload, err = utils.Unmarshal2Map([]byte(params.Payload), dummyStoreMap); err == nil {
retVal, err = cms.UpdateStoreVendorMap(params.Ctx, nil, params.StoreID, params.VendorID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
})