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

- add jxcontext.Context to all public API.

Browse Source
This commit is contained in:
gazebo
2018-10-21 22:41:11 +08:00
parent 5d2bf9a510
commit b51ceb3d1d
22 changed files with 228 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/cms.go
View File

@@ -22,7 +22,7 @@ type CmsController struct {
// @router /GetPlaces [get]
func (c *CmsController) GetPlaces() {
c.callGetPlaces(func(params *tCmsGetPlacesParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetPlaces(params.Keyword, params.IncludeDisabled, params.MapData)
retVal, err = cms.GetPlaces(params.Ctx, params.Keyword, params.IncludeDisabled, params.MapData)
return retVal, "", err
})
}
@@ -38,7 +38,7 @@ func (c *CmsController) UpdatePlaces() {
c.callUpdatePlaces(func(params *tCmsUpdatePlacesParams) (retVal interface{}, errCode string, err error) {
placeList := make([]map[string]interface{}, 0)
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &placeList); err == nil {
retVal, err = cms.UpdatePlaces(placeList, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdatePlaces(params.Ctx, placeList, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -56,7 +56,7 @@ func (c *CmsController) UpdatePlace() {
c.callUpdatePlace(func(params *tCmsUpdatePlaceParams) (retVal interface{}, errCode string, err error) {
place := make(map[string]interface{}, 0)
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &place); err == nil {
retVal, err = cms.UpdatePlace(params.Code, place, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdatePlace(params.Ctx, params.Code, place, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -70,7 +70,7 @@ func (c *CmsController) UpdatePlace() {
// @router /GetServiceInfo [get]
func (c *CmsController) GetServiceInfo() {
c.callGetServiceInfo(func(params *tCmsGetServiceInfoParams) (retVal interface{}, errCode string, err error) {
retVal = cms.GetServiceInfo()
retVal = cms.GetServiceInfo(params.Ctx)
return retVal, "", err
})
}
@@ -84,7 +84,7 @@ func (c *CmsController) GetServiceInfo() {
// @router /GetQiniuUploadToken [get]
func (c *CmsController) GetQiniuUploadToken() {
c.callGetQiniuUploadToken(func(params *tCmsGetQiniuUploadTokenParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetQiniuUploadToken(params.Suffix)
retVal, err = cms.GetQiniuUploadToken(params.Ctx, params.Suffix)
return retVal, "", err
})
}

38
controllers/cms_sku.go
View File

@@ -22,7 +22,7 @@ type SkuController struct {
// @router /GetVendorCategories [get]
func (c *SkuController) GetVendorCategories() {
c.callGetVendorCategories(func(params *tSkuGetVendorCategoriesParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetVendorCategories(params.VendorID, params.ParentID)
retVal, err = cms.GetVendorCategories(params.Ctx, params.VendorID, params.ParentID)
return retVal, "", err
})
}
@@ -39,7 +39,7 @@ func (c *SkuController) GetCategories() {
if c.GetString("parentID") == "" {
params.ParentID = -1
}
retVal, err = cms.GetCategories(params.ParentID)
retVal, err = cms.GetCategories(params.Ctx, params.ParentID)
return retVal, "", err
})
}
@@ -55,7 +55,7 @@ func (c *SkuController) AddCategory() {
c.callAddCategory(func(params *tSkuAddCategoryParams) (retVal interface{}, errCode string, err error) {
cat := &model.SkuCategory{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), cat); err == nil {
retVal, err = cms.AddCategory(cat, GetUserNameFromToken(params.Token))
retVal, err = cms.AddCategory(params.Ctx, cat, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -73,7 +73,7 @@ func (c *SkuController) UpdateCategory() {
c.callUpdateCategory(func(params *tSkuUpdateCategoryParams) (retVal interface{}, errCode string, err error) {
payload := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil {
retVal, err = cms.UpdateCategory(params.CategoryID, payload, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateCategory(params.Ctx, params.CategoryID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -91,7 +91,7 @@ func (c *SkuController) ReorderCategories() {
c.callReorderCategories(func(params *tSkuReorderCategoriesParams) (retVal interface{}, errCode string, err error) {
var idList []int
if err = utils.UnmarshalUseNumber([]byte(params.CategoryIDs), &idList); err == nil {
err = cms.ReorderCategories(params.CategoryID, idList, GetUserNameFromToken(params.Token))
err = cms.ReorderCategories(params.Ctx, params.CategoryID, idList, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -106,7 +106,7 @@ func (c *SkuController) ReorderCategories() {
// @router /DeleteCategory [delete]
func (c *SkuController) DeleteCategory() {
c.callDeleteCategory(func(params *tSkuDeleteCategoryParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteCategory(params.CategoryID, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteCategory(params.Ctx, params.CategoryID, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -122,7 +122,7 @@ func (c *SkuController) DeleteCategory() {
func (c *SkuController) SyncCategory() {
c.callSyncCategory(func(params *tSkuSyncCategoryParams) (retVal interface{}, errCode string, err error) {
db := dao.GetDB()
retVal, err = cms.CurVendorSync.SyncCategory(db, params.CategoryID, params.IsAsync, GetUserNameFromToken(params.Token))
retVal, err = cms.CurVendorSync.SyncCategory(params.Ctx, db, params.CategoryID, params.IsAsync, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -150,7 +150,7 @@ func (c *SkuController) SyncCategory() {
// @router /GetSkuNames [get]
func (c *SkuController) GetSkuNames() {
c.callGetSkuNames(func(params *tSkuGetSkuNamesParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetSkuNames(params.Keyword, params.MapData, params.Offset, params.PageSize)
retVal, err = cms.GetSkuNames(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}
@@ -166,7 +166,7 @@ func (c *SkuController) AddSkuName() {
c.callAddSkuName(func(params *tSkuAddSkuNameParams) (retVal interface{}, errCode string, err error) {
skuName := &model.SkuNameExt{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), skuName); err == nil {
retVal, err = cms.AddSkuName(skuName, GetUserNameFromToken(params.Token))
retVal, err = cms.AddSkuName(params.Ctx, skuName, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -184,7 +184,7 @@ 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 {
retVal, err = cms.UpdateSkuName(params.NameID, payload, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -199,7 +199,7 @@ func (c *SkuController) UpdateSkuName() {
// @router /DeleteSkuName [delete]
func (c *SkuController) DeleteSkuName() {
c.callDeleteSkuName(func(params *tSkuDeleteSkuNameParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteSkuName(params.NameID, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteSkuName(params.Ctx, params.NameID, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -216,7 +216,7 @@ func (c *SkuController) AddSku() {
c.callAddSku(func(params *tSkuAddSkuParams) (retVal interface{}, errCode string, err error) {
sku := &model.Sku{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), sku); err == nil {
retVal, err = cms.AddSku(params.NameID, sku, GetUserNameFromToken(params.Token))
retVal, err = cms.AddSku(params.Ctx, params.NameID, sku, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -234,7 +234,7 @@ 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 {
retVal, err = cms.UpdateSku(params.SkuID, payload, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateSku(params.Ctx, params.SkuID, payload, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -249,7 +249,7 @@ func (c *SkuController) UpdateSku() {
// @router /DeleteSku [delete]
func (c *SkuController) DeleteSku() {
c.callDeleteSku(func(params *tSkuDeleteSkuParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteSku(params.SkuID, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteSku(params.Ctx, params.SkuID, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -264,7 +264,7 @@ func (c *SkuController) DeleteSku() {
// @router /AddSkuNamePlace [post]
func (c *SkuController) AddSkuNamePlace() {
c.callAddSkuNamePlace(func(params *tSkuAddSkuNamePlaceParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.AddSkuNamePlace(params.NameID, params.PlaceCode, GetUserNameFromToken(params.Token))
retVal, err = cms.AddSkuNamePlace(params.Ctx, params.NameID, params.PlaceCode, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -279,7 +279,7 @@ func (c *SkuController) AddSkuNamePlace() {
// @router /DeleteSkuNamePlace [delete]
func (c *SkuController) DeleteSkuNamePlace() {
c.callDeleteSkuNamePlace(func(params *tSkuDeleteSkuNamePlaceParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteSkuNamePlace(params.NameID, params.PlaceCode, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteSkuNamePlace(params.Ctx, params.NameID, params.PlaceCode, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -294,7 +294,7 @@ func (c *SkuController) DeleteSkuNamePlace() {
// @router /GetVendorSku [get]
func (c *SkuController) GetVendorSku() {
c.callGetVendorSku(func(params *tSkuGetVendorSkuParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetVendorSku(params.VendorID, params.VendorSkuID)
retVal, err = cms.GetVendorSku(params.Ctx, params.VendorID, params.VendorSkuID)
return retVal, "", err
})
}
@@ -311,7 +311,7 @@ func (c *SkuController) GetVendorSku() {
func (c *SkuController) SyncSku() {
c.callSyncSku(func(params *tSkuSyncSkuParams) (retVal interface{}, errCode string, err error) {
db := dao.GetDB()
retVal, err = cms.CurVendorSync.SyncSku(db, params.NameID, params.SkuID, params.IsAsync, GetUserNameFromToken(params.Token))
retVal, err = cms.CurVendorSync.SyncSku(params.Ctx, db, params.NameID, params.SkuID, params.IsAsync, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -326,7 +326,7 @@ func (c *SkuController) SyncSku() {
// @router /RefreshSkuIDs [put]
func (c *SkuController) RefreshSkuIDs() {
c.callRefreshSkuIDs(func(params *tSkuRefreshSkuIDsParams) (retVal interface{}, errCode string, err error) {
err = cms.CurVendorSync.RefreshSkuIDs(params.NameID, params.SkuID, GetUserNameFromToken(params.Token))
err = cms.CurVendorSync.RefreshSkuIDs(params.Ctx, params.NameID, params.SkuID, params.Ctx.GetUserName())
return retVal, "", err
})
}

28
controllers/cms_store.go
View File

@@ -34,7 +34,7 @@ type StoreController struct {
// @router /GetStores [get]
func (c *StoreController) GetStores() {
c.callGetStores(func(params *tStoreGetStoresParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetStores(params.Keyword, params.MapData, params.Offset, params.PageSize)
retVal, err = cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}
@@ -49,7 +49,7 @@ func (c *StoreController) GetStores() {
// @router /GetVendorStore [get]
func (c *StoreController) GetVendorStore() {
c.callGetVendorStore(func(params *tStoreGetVendorStoreParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetVendorStore(params.VendorStoreID, params.VendorID)
retVal, err = cms.GetVendorStore(params.Ctx, params.VendorStoreID, params.VendorID)
return retVal, "", err
})
}
@@ -66,7 +66,7 @@ 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.StoreID, store, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStore(params.Ctx, params.StoreID, store, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -83,7 +83,7 @@ func (c *StoreController) CreateStore() {
c.callCreateStore(func(params *tStoreCreateStoreParams) (retVal interface{}, errCode string, err error) {
store := &model.Store{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), store); err == nil {
retVal, err = cms.CreateStore(store, GetUserNameFromToken(params.Token))
retVal, err = cms.CreateStore(params.Ctx, store, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -112,7 +112,7 @@ func (c *StoreController) GetStoreVendorMaps() {
if c.GetString("vendorID") == "" {
params.VendorID = -1
}
retVal, err = cms.GetStoreVendorMaps(nil, params.StoreID, params.VendorID)
retVal, err = cms.GetStoreVendorMaps(params.Ctx, nil, params.StoreID, params.VendorID)
return retVal, "", err
})
}
@@ -130,7 +130,7 @@ func (c *StoreController) UpdateStoreVendorMap() {
c.callUpdateStoreVendorMap(func(params *tStoreUpdateStoreVendorMapParams) (retVal interface{}, errCode string, err error) {
storeMap := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &storeMap); err == nil {
retVal, err = cms.UpdateStoreVendorMap(nil, params.StoreID, params.VendorID, storeMap, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoreVendorMap(params.Ctx, nil, params.StoreID, params.VendorID, storeMap, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -149,7 +149,7 @@ func (c *StoreController) AddStoreVendorMap() {
c.callAddStoreVendorMap(func(params *tStoreAddStoreVendorMapParams) (retVal interface{}, errCode string, err error) {
storeMap := &model.StoreMap{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), storeMap); err == nil {
retVal, err = cms.AddStoreVendorMap(nil, params.StoreID, params.VendorID, storeMap, GetUserNameFromToken(params.Token))
retVal, err = cms.AddStoreVendorMap(params.Ctx, nil, params.StoreID, params.VendorID, storeMap, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -165,7 +165,7 @@ func (c *StoreController) AddStoreVendorMap() {
// @router /DeleteStoreVendorMap [delete]
func (c *StoreController) DeleteStoreVendorMap() {
c.callDeleteStoreVendorMap(func(params *tStoreDeleteStoreVendorMapParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteStoreVendorMap(nil, params.StoreID, params.VendorID, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteStoreVendorMap(params.Ctx, nil, params.StoreID, params.VendorID, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -179,7 +179,7 @@ func (c *StoreController) DeleteStoreVendorMap() {
// @router /TmpGetJxBadCommentsNo [get]
func (c *StoreController) TmpGetJxBadCommentsNo() {
c.callTmpGetJxBadCommentsNo(func(params *tStoreTmpGetJxBadCommentsNoParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.TmpGetJxBadCommentsNo(params.JxStoreId)
retVal, err = cms.TmpGetJxBadCommentsNo(params.Ctx, params.JxStoreId)
return retVal, "", err
})
}
@@ -196,7 +196,7 @@ func (c *StoreController) TmpGetJxBadCommentsNo() {
// @router /TmpGetJxBadCommentsByStoreId [get]
func (c *StoreController) TmpGetJxBadCommentsByStoreId() {
c.callTmpGetJxBadCommentsByStoreId(func(params *tStoreTmpGetJxBadCommentsByStoreIdParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.TmpGetJxBadCommentsByStoreId(params.JxStoreId, params.Page, params.Size, params.Type)
retVal, err = cms.TmpGetJxBadCommentsByStoreId(params.Ctx, params.JxStoreId, params.Page, params.Size, params.Type)
return retVal, "", err
})
}
@@ -214,7 +214,7 @@ func (c *StoreController) GetStoreCourierMaps() {
if c.GetString("vendorID") == "" {
params.VendorID = -1
}
retVal, err = cms.GetStoreCourierMaps(nil, params.StoreID, params.VendorID)
retVal, err = cms.GetStoreCourierMaps(params.Ctx, nil, params.StoreID, params.VendorID)
return retVal, "", err
})
}
@@ -232,7 +232,7 @@ func (c *StoreController) UpdateStoreCourierMap() {
c.callUpdateStoreCourierMap(func(params *tStoreUpdateStoreCourierMapParams) (retVal interface{}, errCode string, err error) {
storeCourierMap := make(map[string]interface{})
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &storeCourierMap); err == nil {
retVal, err = cms.UpdateStoreCourierMap(nil, params.StoreID, params.VendorID, storeCourierMap, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoreCourierMap(params.Ctx, nil, params.StoreID, params.VendorID, storeCourierMap, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -251,7 +251,7 @@ func (c *StoreController) AddStoreCourierMap() {
c.callAddStoreCourierMap(func(params *tStoreAddStoreCourierMapParams) (retVal interface{}, errCode string, err error) {
storeCourierMap := &model.StoreCourierMap{}
if err = utils.UnmarshalUseNumber([]byte(params.Payload), storeCourierMap); err == nil {
retVal, err = cms.AddStoreCourierMap(nil, params.StoreID, params.VendorID, storeCourierMap, GetUserNameFromToken(params.Token))
retVal, err = cms.AddStoreCourierMap(params.Ctx, nil, params.StoreID, params.VendorID, storeCourierMap, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -267,7 +267,7 @@ func (c *StoreController) AddStoreCourierMap() {
// @router /DeleteStoreCourierMap [delete]
func (c *StoreController) DeleteStoreCourierMap() {
c.callDeleteStoreCourierMap(func(params *tStoreDeleteStoreCourierMapParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.DeleteStoreCourierMap(nil, params.StoreID, params.VendorID, GetUserNameFromToken(params.Token))
retVal, err = cms.DeleteStoreCourierMap(params.Ctx, nil, params.StoreID, params.VendorID, params.Ctx.GetUserName())
return retVal, "", err
})
}

14
controllers/cms_store_sku.go
View File

@@ -33,7 +33,7 @@ type StoreSkuController struct {
// @router /GetStoreSkus [get]
func (c *StoreSkuController) GetStoreSkus() {
c.callGetStoreSkus(func(params *tStoreSkuGetStoreSkusParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetStoreSkus(params.StoreID, params.IsFocus, params.Keyword, params.MapData, params.Offset, params.PageSize)
retVal, err = cms.GetStoreSkus(params.Ctx, params.StoreID, params.IsFocus, params.Keyword, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}
@@ -50,7 +50,7 @@ func (c *StoreSkuController) UpdateStoreSku() {
c.callUpdateStoreSku(func(params *tStoreSkuUpdateStoreSkuParams) (retVal interface{}, errCode string, err error) {
var skuBindInfo cms.StoreSkuBindInfo
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &skuBindInfo); err == nil {
retVal, err = cms.UpdateStoreSku(params.StoreID, &skuBindInfo, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoreSku(params.Ctx, params.StoreID, &skuBindInfo, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -68,7 +68,7 @@ func (c *StoreSkuController) UpdateStoreSkus() {
c.callUpdateStoreSkus(func(params *tStoreSkuUpdateStoreSkusParams) (retVal interface{}, errCode string, err error) {
var skuBindInfos []*cms.StoreSkuBindInfo
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &skuBindInfos); err == nil {
retVal, err = cms.UpdateStoreSkus(params.StoreID, skuBindInfos, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoreSkus(params.Ctx, params.StoreID, skuBindInfos, params.Ctx.GetUserName())
}
return retVal, "", err
})
@@ -101,7 +101,7 @@ func (c *StoreSkuController) SyncStoresSkus() {
return retVal, "", err
}
}
retVal, err = cms.CurVendorSync.SyncStoresSkus(db, vendorIDs, storeIDs, skuIDs, params.IsAsync, GetUserNameFromToken(params.Token))
retVal, err = cms.CurVendorSync.SyncStoresSkus(params.Ctx, db, vendorIDs, storeIDs, skuIDs, params.IsAsync, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -120,7 +120,7 @@ func (c *StoreSkuController) UpdateStoresSkus() {
var skuBindInfos []*cms.StoreSkuBindInfo
if err = utils.UnmarshalUseNumber([]byte(params.StoreIDs), &storeIDs); err == nil {
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &skuBindInfos); err == nil {
retVal, err = cms.UpdateStoresSkus(storeIDs, skuBindInfos, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoresSkus(params.Ctx, storeIDs, skuBindInfos, params.Ctx.GetUserName())
}
}
return retVal, "", err
@@ -141,7 +141,7 @@ func (c *StoreSkuController) UpdateStoresSkus() {
// @router /CopyStoreSkus [post]
func (c *StoreSkuController) CopyStoreSkus() {
c.callCopyStoreSkus(func(params *tStoreSkuCopyStoreSkusParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.CopyStoreSkus(params.FromStoreID, params.ToStoreID, params.CopyMode, params.MapData, GetUserNameFromToken(params.Token))
retVal, err = cms.CopyStoreSkus(params.Ctx, params.FromStoreID, params.ToStoreID, params.CopyMode, params.MapData, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -160,7 +160,7 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
var skuBindSkuInfos []*cms.StoreSkuBindSkuInfo
if err = utils.UnmarshalUseNumber([]byte(params.StoreIDs), &storeIDs); err == nil {
if err = utils.UnmarshalUseNumber([]byte(params.Payload), &skuBindSkuInfos); err == nil {
retVal, err = cms.UpdateStoresSkusSale(storeIDs, skuBindSkuInfos, GetUserNameFromToken(params.Token))
retVal, err = cms.UpdateStoresSkusSale(params.Ctx, storeIDs, skuBindSkuInfos, params.Ctx.GetUserName())
}
}
return retVal, "", err

14
controllers/cms_user.go
View File

@@ -19,7 +19,7 @@ type UserController struct {
// @router /TmpGetStoreUsers [get]
func (c *UserController) TmpGetStoreUsers() {
c.callTmpGetStoreUsers(func(params *tUserTmpGetStoreUsersParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetStoreUsers(params.StoreID)
retVal, err = cms.GetStoreUsers(params.Ctx, params.StoreID)
return retVal, "", err
})
}
@@ -33,7 +33,7 @@ func (c *UserController) TmpGetStoreUsers() {
// @router /TmpGetUserInfo [get]
func (c *UserController) TmpGetUserInfo() {
c.callTmpGetUserInfo(func(params *tUserTmpGetUserInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetUserInfo(params.Mobile)
retVal, err = cms.GetUserInfo(params.Ctx, params.Mobile)
return retVal, "", err
})
}
@@ -48,7 +48,7 @@ func (c *UserController) TmpGetSelfInfo() {
c.callTmpGetSelfInfo(func(params *tUserTmpGetSelfInfoParams) (retVal interface{}, errCode string, err error) {
tokenInfo, err2 := auth.GetUserInfo(params.Token)
if err = err2; err == nil {
retVal, err = cms.GetSelfInfo(tokenInfo.ID)
retVal, err = cms.GetSelfInfo(params.Ctx, tokenInfo.ID)
}
return retVal, "", err
})
@@ -63,7 +63,7 @@ func (c *UserController) TmpGetSelfInfo() {
// @router /TmpUnbindMobile [put]
func (c *UserController) TmpUnbindMobile() {
c.callTmpUnbindMobile(func(params *tUserTmpUnbindMobileParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.UnbindMobile(params.Mobile)
retVal, err = cms.UnbindMobile(params.Ctx, params.Mobile)
return retVal, "", err
})
}
@@ -78,7 +78,7 @@ func (c *UserController) TmpUnbindMobile() {
// @router /TmpBindMobile2Store [put]
func (c *UserController) TmpBindMobile2Store() {
c.callTmpBindMobile2Store(func(params *tUserTmpBindMobile2StoreParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.BindMobile2Store(params.Mobile, params.StoreID)
retVal, err = cms.BindMobile2Store(params.Ctx, params.Mobile, params.StoreID)
return retVal, "", err
})
}
@@ -93,7 +93,7 @@ func (c *UserController) TmpBindMobile2Store() {
// @router /TmpAddMobile2Mobile [put]
func (c *UserController) TmpAddMobile2Mobile() {
c.callTmpAddMobile2Mobile(func(params *tUserTmpAddMobile2MobileParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.AddMobile2Mobile(params.ParentMobile, params.Mobile)
retVal, err = cms.AddMobile2Mobile(params.Ctx, params.ParentMobile, params.Mobile)
return retVal, "", err
})
}
@@ -108,7 +108,7 @@ func (c *UserController) TmpAddMobile2Mobile() {
// @router /TmpChangeMobile [put]
func (c *UserController) TmpChangeMobile() {
c.callTmpChangeMobile(func(params *tUserTmpChangeMobileParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.ChangeMobile(params.CurMobile, params.ExpectedMobile)
retVal, err = cms.ChangeMobile(params.Ctx, params.CurMobile, params.ExpectedMobile)
return retVal, "", err
})
}

2
controllers/financial.go
View File

@@ -36,7 +36,7 @@ func (c *FinancialController) SendFilesToStores() {
c.callSendFilesToStores(func(params *tFinancialSendFilesToStoresParams) (retVal interface{}, errCode string, err error) {
r := c.Ctx.Request
files := r.MultipartForm.File["userfiles"]
retVal, err = financial.SendFilesToStores(files, params.IsAsync, GetUserNameFromToken(params.Token))
retVal, err = financial.SendFilesToStores(params.Ctx, files, params.IsAsync, params.Ctx.GetUserName())
return retVal, "", err
})
}

32
controllers/jx_order.go
View File

@@ -17,14 +17,6 @@ type OrderController struct {
beego.Controller
}
func GetUserNameFromToken(token string) string {
userName := token
if len(userName) > 10 {
userName = userName[:10]
}
return userName
}
func (c *OrderController) URLMapping() {
c.Mapping("GetStoreOrderInfo", c.GetStoreOrderInfo)
c.Mapping("GetOrderSkuInfo", c.GetOrderSkuInfo)
@@ -45,7 +37,7 @@ func (c *OrderController) URLMapping() {
// @router /FinishedPickup [post]
func (c *OrderController) FinishedPickup() {
c.callFinishedPickup(func(params *tOrderFinishedPickupParams) (retVal interface{}, errCode string, err error) {
err = defsch.FixedScheduler.PickupGoodsAndUpdateStatus(params.VendorOrderID, params.VendorID, GetUserNameFromToken(params.Token))
err = defsch.FixedScheduler.PickupGoodsAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
return nil, "", err
})
}
@@ -60,7 +52,7 @@ func (c *OrderController) FinishedPickup() {
// @router /SelfDelivering [post]
func (c *OrderController) SelfDelivering() {
c.callSelfDelivering(func(params *tOrderSelfDeliveringParams) (retVal interface{}, errCode string, err error) {
err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatusExt(params.VendorOrderID, params.VendorID, GetUserNameFromToken(params.Token))
err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatusExt(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
return nil, "", err
})
}
@@ -75,7 +67,7 @@ func (c *OrderController) SelfDelivering() {
// @router /SelfDelivered [post]
func (c *OrderController) SelfDelivered() {
c.callSelfDelivered(func(params *tOrderSelfDeliveredParams) (retVal interface{}, errCode string, err error) {
err = defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(params.VendorOrderID, params.VendorID, GetUserNameFromToken(params.Token))
err = defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
return nil, "", err
})
}
@@ -90,7 +82,7 @@ func (c *OrderController) SelfDelivered() {
// @router /CreateWaybillOnProviders [post]
func (c *OrderController) CreateWaybillOnProviders() {
c.callCreateWaybillOnProviders(func(params *tOrderCreateWaybillOnProvidersParams) (retVal interface{}, errCode string, err error) {
retVal, err = defsch.FixedScheduler.CreateWaybillOnProviders(params.VendorOrderID, params.VendorID, GetUserNameFromToken(params.Token))
retVal, err = defsch.FixedScheduler.CreateWaybillOnProviders(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -105,7 +97,7 @@ func (c *OrderController) CreateWaybillOnProviders() {
// @router /GetStoreOrderCountInfo [get]
func (c *OrderController) GetStoreOrderCountInfo() {
c.callGetStoreOrderCountInfo(func(params *tOrderGetStoreOrderCountInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetStoreOrderCountInfo(params.StoreID, params.LastHours)
retVal, err = orderman.FixedOrderManager.GetStoreOrderCountInfo(params.Ctx, params.StoreID, params.LastHours)
return retVal, "", err
})
}
@@ -124,7 +116,7 @@ func (c *OrderController) GetStoreOrderCountInfo() {
// @router /GetStoreOrderInfo [get]
func (c *OrderController) GetStoreOrderInfo() {
c.callGetStoreOrderInfo(func(params *tOrderGetStoreOrderInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetStoreOrderInfo(params.StoreID, params.LastHours, params.FromStatus, params.ToStatus, params.Offset, params.PageSize)
retVal, err = orderman.FixedOrderManager.GetStoreOrderInfo(params.Ctx, params.StoreID, params.LastHours, params.FromStatus, params.ToStatus, params.Offset, params.PageSize)
return retVal, "", err
})
}
@@ -139,7 +131,7 @@ func (c *OrderController) GetStoreOrderInfo() {
// @router /GetOrderSkuInfo [get]
func (c *OrderController) GetOrderSkuInfo() {
c.callGetOrderSkuInfo(func(params *tOrderGetOrderSkuInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetOrderSkuInfo(params.VendorOrderID, params.VendorID)
retVal, err = orderman.FixedOrderManager.GetOrderSkuInfo(params.Ctx, params.VendorOrderID, params.VendorID)
return retVal, "", err
})
}
@@ -155,7 +147,7 @@ func (c *OrderController) GetOrderSkuInfo() {
// @router /GetOrderInfo [get]
func (c *OrderController) GetOrderInfo() {
c.callGetOrderInfo(func(params *tOrderGetOrderInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetOrderInfo(params.VendorOrderID, params.VendorID, params.Refresh)
retVal, err = orderman.FixedOrderManager.GetOrderInfo(params.Ctx, params.VendorOrderID, params.VendorID, params.Refresh)
return retVal, "", err
})
}
@@ -170,7 +162,7 @@ func (c *OrderController) GetOrderInfo() {
// @router /GetOrderWaybillInfo [get]
func (c *OrderController) GetOrderWaybillInfo() {
c.callGetOrderWaybillInfo(func(params *tOrderGetOrderWaybillInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetOrderWaybillInfo(params.VendorOrderID, params.VendorID)
retVal, err = orderman.FixedOrderManager.GetOrderWaybillInfo(params.Ctx, params.VendorOrderID, params.VendorID)
return retVal, "", err
})
}
@@ -192,7 +184,7 @@ func (c *OrderController) ExportMTWaybills() {
if toDate == "" {
toDate = fromDate
}
content, err = orderman.FixedOrderManager.ExportMTWaybills(params.FromDate, params.ToDate)
content, err = orderman.FixedOrderManager.ExportMTWaybills(params.Ctx, params.FromDate, params.ToDate)
globals.SugarLogger.Debug(err)
return retVal, ignoreCode, err
})
@@ -222,7 +214,7 @@ func (c *OrderController) ExportMTWaybills() {
// @router /GetOrders [get]
func (c *OrderController) GetOrders() {
c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetOrders(params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize)
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}
@@ -242,7 +234,7 @@ func (c *OrderController) GetOrders() {
// @router /GetWaybills [get]
func (c *OrderController) GetWaybills() {
c.callGetWaybills(func(params *tOrderGetWaybillsParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.GetWaybills(params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize)
retVal, err = orderman.FixedOrderManager.GetWaybills(params.Ctx, params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize)
return retVal, "", err
})
}

6
controllers/promotion.go
View File

@@ -44,7 +44,7 @@ func (c *PromotionController) CreatePromotion() {
}
if err = utils.UnmarshalUseNumber([]byte(params.StoreIDs), &promotionParams.StoreIDs); err == nil {
if err = utils.UnmarshalUseNumber([]byte(params.SkuPrices), &promotionParams.SkuPrices); err == nil {
retVal, err = promotion.CreateJdPromotion(false, params.IsAsync, promotionParams, GetUserNameFromToken(params.Token))
retVal, err = promotion.CreateJdPromotion(params.Ctx, false, params.IsAsync, promotionParams, params.Ctx.GetUserName())
}
}
return retVal, "", err
@@ -79,7 +79,7 @@ func (c *PromotionController) CreatePromotionByExcel() {
c.callCreatePromotionByExcel(func(params *tPromotionCreatePromotionByExcelParams) (retVal interface{}, errCode string, err error) {
r := c.Ctx.Request
files := r.MultipartForm.File["userfile"]
retVal, err = promotion.CreatePromotionByExcel(params.IsAsync, params.Type, files[0], "userName") //GetUserNameFromToken(params.Token))
retVal, err = promotion.CreatePromotionByExcel(params.Ctx, params.IsAsync, params.Type, files[0], "userName") //params.Ctx.GetUserName())
return retVal, "", err
})
}
@@ -96,7 +96,7 @@ func (c *PromotionController) CreatePromotionByExcel() {
// @router /SendAdvertingByGoodsOrder [post]
func (c *PromotionController) SendAdvertingByGoodsOrder() {
c.callSendAdvertingByGoodsOrder(func(params *tPromotionSendAdvertingByGoodsOrderParams) (retVal interface{}, errCode string, err error) {
retVal, err = promotion.SendAdvertingByGoodsOrder(params.Advertising, params.Days, params.IsAsync, GetUserNameFromToken(params.Token))
retVal, err = promotion.SendAdvertingByGoodsOrder(params.Ctx, params.Advertising, params.Days, params.IsAsync, params.Ctx.GetUserName())
return retVal, "", err
})
}