diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 5ee709fdc..e8f329162 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/excel" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" @@ -25,7 +26,7 @@ type tWaybillExt struct { StoreID int `json:"storeID" orm:"column(store_id)"` } -func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) { +func (c *OrderManager) GetStoreOrderInfo(ctx *jxcontext.Context, storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) { globals.SugarLogger.Debugf("GetStoreOrderInfo storeID:%s", storeID) if lastHours > maxLastHours { lastHours = maxLastHours @@ -58,7 +59,7 @@ func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStat return nil, err } -func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (countInfo []*model.GoodsOrderCountInfo, err error) { +func (c *OrderManager) GetStoreOrderCountInfo(ctx *jxcontext.Context, storeID string, lastHours int) (countInfo []*model.GoodsOrderCountInfo, err error) { globals.SugarLogger.Debugf("GetStoreOrderCountInfo storeID:%s", storeID) if lastHours > maxLastHours { lastHours = maxLastHours @@ -82,7 +83,7 @@ func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (co return nil, err } -func (c *OrderManager) GetOrderSkuInfo(vendorOrderID string, vendorID int) (skus []*model.OrderSkuExt, err error) { +func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (skus []*model.OrderSkuExt, err error) { globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID) if globals.OrderUseNewTable { db := dao.GetDB() @@ -148,7 +149,7 @@ func (c *OrderManager) GetOrderSkuInfo(vendorOrderID string, vendorID int) (skus return nil, err } -func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int, isRefresh bool) (order *model.GoodsOrderExt, err error) { +func (c *OrderManager) GetOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isRefresh bool) (order *model.GoodsOrderExt, err error) { globals.SugarLogger.Debugf("GetOrderInfo orderID:%s", vendorOrderID) db := orm.NewOrm() orders := []*model.GoodsOrderExt{} @@ -180,7 +181,7 @@ func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int, isRefres return nil, err } -func (c *OrderManager) GetOrderWaybillInfo(vendorOrderID string, vendorID int) (bills []*model.Waybill, err error) { +func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (bills []*model.Waybill, err error) { globals.SugarLogger.Debugf("GetOrderWaybillInfo orderID:%s", vendorOrderID) db := orm.NewOrm() _, err = db.Raw(` @@ -195,7 +196,7 @@ func (c *OrderManager) GetOrderWaybillInfo(vendorOrderID string, vendorID int) ( return nil, err } -func (c *OrderManager) ExportMTWaybills(fromDateStr, toDateStr string) (excelContent []byte, err error) { +func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string) (excelContent []byte, err error) { globals.SugarLogger.Debugf("ExportMTWaybills from:%s to:%s", fromDateStr, toDateStr) fromDate := utils.Str2Time(fromDateStr) @@ -236,7 +237,7 @@ func (c *OrderManager) ExportMTWaybills(fromDateStr, toDateStr string) (excelCon return nil, err } -func (c *OrderManager) GetOrders(fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { +func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr) fromDate := utils.Str2Time(fromDateStr) @@ -357,7 +358,7 @@ func (c *OrderManager) GetOrders(fromDateStr, toDateStr string, params map[strin return pagedInfo, err } -func (c *OrderManager) GetWaybills(fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { +func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { globals.SugarLogger.Debugf("GetWaybills from:%s to:%s", fromDateStr, toDateStr) fromDate := utils.Str2Time(fromDateStr) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 042e5729c..f4f66d603 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -3,6 +3,7 @@ package basesch import ( "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/legacymodel2" @@ -11,7 +12,7 @@ import ( "github.com/astaxie/beego/orm" ) -func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) { +func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) { globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { @@ -31,7 +32,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID return nil, err } -func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { +func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { @@ -52,7 +53,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(vendorOrderID string, vendo return err } -func (c *BaseScheduler) PickupGoodsAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { +func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 924f9725f..4c24f4a4e 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -3,12 +3,13 @@ package defsch import ( "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" ) -func (s *DefScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { +func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) status := &model.OrderStatus{ VendorOrderID: vendorOrderID, @@ -47,9 +48,9 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendo return err } -func (s *DefScheduler) SelfDeliveringAndUpdateStatusExt(vendorOrderID string, vendorID int, userName string) (err error) { +func (s *DefScheduler) SelfDeliveringAndUpdateStatusExt(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { jxutils.CallMsgHandler(func() { - err = s.SelfDeliveringAndUpdateStatus(vendorOrderID, vendorID, userName) + err = s.SelfDeliveringAndUpdateStatus(ctx, vendorOrderID, vendorID, userName) }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) return err } diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index aea8e1a2a..14eb1218a 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -6,6 +6,7 @@ import ( "strconv" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" @@ -44,11 +45,11 @@ func InitServiceInfo(version, buildDate, gitCommit string) { Init() } -func GetServiceInfo() interface{} { +func GetServiceInfo(ctx *jxcontext.Context) interface{} { return serviceInfo } -func GetQiniuUploadToken(suffix string) (upTokenInfo map[string]interface{}, err error) { +func GetQiniuUploadToken(ctx *jxcontext.Context, suffix string) (upTokenInfo map[string]interface{}, err error) { putPolicy := storage.PutPolicy{ Scope: globals.QiniuBucket, Expires: qiniuTokenExpires, @@ -61,7 +62,7 @@ func GetQiniuUploadToken(suffix string) (upTokenInfo map[string]interface{}, err return upTokenInfo, err } -func GetPlaces(keyword string, includeDisabled bool, params map[string]interface{}) ([]*model.Place, error) { +func GetPlaces(ctx *jxcontext.Context, keyword string, includeDisabled bool, params map[string]interface{}) ([]*model.Place, error) { sql := ` SELECT * FROM place t1 @@ -94,7 +95,7 @@ func GetPlaces(keyword string, includeDisabled bool, params map[string]interface return places, dao.GetRows(nil, &places, sql, sqlParams) } -func UpdatePlaces(places []map[string]interface{}, userName string) (num int64, err error) { +func UpdatePlaces(ctx *jxcontext.Context, places []map[string]interface{}, userName string) (num int64, err error) { if len(places) == 0 { return 0, ErrMissingInput } @@ -111,9 +112,9 @@ func UpdatePlaces(places []map[string]interface{}, userName string) (num int64, return num, err } -func UpdatePlace(placeCode int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdatePlace(ctx *jxcontext.Context, placeCode int, payload map[string]interface{}, userName string) (num int64, err error) { payload["code"] = placeCode - return UpdatePlaces([]map[string]interface{}{payload}, userName) + return UpdatePlaces(ctx, []map[string]interface{}{payload}, userName) } ///// diff --git a/business/jxstore/cms/cms_test.go b/business/jxstore/cms/cms_test.go index d51a7b631..c295f981b 100644 --- a/business/jxstore/cms/cms_test.go +++ b/business/jxstore/cms/cms_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/beegodb" @@ -20,7 +21,7 @@ func init() { } func TestGetQiniuUploadToken(t *testing.T) { - token, err := GetQiniuUploadToken("") + token, err := GetQiniuUploadToken(jxcontext.AdminCtx, "") if err != nil { t.Fatal(err) } diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c69534025..d9957af0e 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" ) @@ -21,7 +22,7 @@ var ( ) // parentID 为-1表示所有 -func GetVendorCategories(vendorID int, parentID string) (vendorCats []*model.SkuVendorCategory, err error) { +func GetVendorCategories(ctx *jxcontext.Context, vendorID int, parentID string) (vendorCats []*model.SkuVendorCategory, err error) { cond := map[string]interface{}{ model.FieldVendorID: vendorID, } @@ -32,7 +33,7 @@ func GetVendorCategories(vendorID int, parentID string) (vendorCats []*model.Sku } // parentID 为-1表示所有 -func GetCategories(parentID int) (cats []*model.SkuCategory, err error) { +func GetCategories(ctx *jxcontext.Context, parentID int) (cats []*model.SkuCategory, err error) { params := []interface{}{ utils.DefaultTimeValue, } @@ -45,7 +46,7 @@ func GetCategories(parentID int) (cats []*model.SkuCategory, err error) { return cats, dao.GetRows(nil, &cats, sql, params) } -func AddCategory(cat *model.SkuCategory, userName string) (outCat *model.SkuCategory, err error) { +func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string) (outCat *model.SkuCategory, err error) { dao.WrapAddIDCULDEntity(cat, userName) cat.JdSyncStatus = model.SyncFlagNewMask cat.JdID = jxutils.GenFakeID() @@ -61,25 +62,25 @@ func AddCategory(cat *model.SkuCategory, userName string) (outCat *model.SkuCate } if err = dao.CreateEntity(nil, cat); err == nil { outCat = cat - _, err = CurVendorSync.SyncCategory(nil, cat.ID, false, userName) + _, err = CurVendorSync.SyncCategory(ctx, nil, cat.ID, false, userName) } return outCat, err } -func UpdateCategory(categoryID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateCategory(ctx *jxcontext.Context, categoryID int, payload map[string]interface{}, userName string) (num int64, err error) { cat := &model.SkuCategory{} cat.ID = categoryID valid := dao.NormalMakeMapByStructObject(payload, cat, userName) if len(valid) > 0 { db := dao.GetDB() if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, cat, valid, userName, nil, model.FieldJdSyncStatus); err == nil { - _, err = CurVendorSync.SyncCategory(db, categoryID, false, userName) + _, err = CurVendorSync.SyncCategory(ctx, db, categoryID, false, userName) } } return num, err } -func ReorderCategories(parentID int, categoryIDs []int, userName string) (err error) { +func ReorderCategories(ctx *jxcontext.Context, parentID int, categoryIDs []int, userName string) (err error) { var cats []*model.SkuCategory parentCat := &model.SkuCategory{} parentCat.ID = parentID @@ -107,14 +108,14 @@ func ReorderCategories(parentID int, categoryIDs []int, userName string) (err er } } if err == nil { - _, err = CurVendorSync.SyncReorderCategories(db, parentID, false, userName) + _, err = CurVendorSync.SyncReorderCategories(ctx, db, parentID, false, userName) } } } return err } -func DeleteCategory(categoryID int, userName string) (num int64, err error) { +func DeleteCategory(ctx *jxcontext.Context, categoryID int, userName string) (num int64, err error) { cat := &model.SkuCategory{} cat.ID = categoryID var countInfos []*struct{ Ct int } @@ -140,13 +141,13 @@ func DeleteCategory(categoryID int, userName string) (num int64, err error) { return 0, errors.New("还有商品类别使用此类别，不能删除") } if num, err = dao.DeleteEntityLogically(db, cat, utils.Params2Map(model.FieldJdSyncStatus, model.SyncFlagDeletedMask), userName, nil); err == nil && num == 1 { - _, err = CurVendorSync.SyncCategory(db, cat.ID, false, userName) + _, err = CurVendorSync.SyncCategory(ctx, db, cat.ID, false, userName) } } return num, err } -func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *SkuNamesInfo, err error) { +func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *SkuNamesInfo, err error) { db := dao.GetDB() sql := ` FROM sku_name t1 @@ -311,7 +312,7 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize return skuNamesInfo, err } -func AddSkuName(skuNameExt *model.SkuNameExt, userName string) (outSkuNameExt *model.SkuNameExt, err error) { +func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName string) (outSkuNameExt *model.SkuNameExt, err error) { if skuNameExt.CategoryID == 0 { return nil, errors.New("CategoryID不能为空") } @@ -351,7 +352,7 @@ func AddSkuName(skuNameExt *model.SkuNameExt, userName string) (outSkuNameExt *m } } dao.Commit(db) - tmpInfo, err := GetSkuNames("", utils.Params2Map("nameID", skuNameExt.SkuName.ID), 0, 1) + tmpInfo, err := GetSkuNames(ctx, "", utils.Params2Map("nameID", skuNameExt.SkuName.ID), 0, 1) if err != nil { return nil, err } @@ -359,11 +360,11 @@ func AddSkuName(skuNameExt *model.SkuNameExt, userName string) (outSkuNameExt *m return nil, ErrEntityNotExist } outSkuNameExt = tmpInfo.SkuNames[0] - _, err = CurVendorSync.SyncSku(db, outSkuNameExt.SkuName.ID, -1, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, outSkuNameExt.SkuName.ID, -1, false, userName) return outSkuNameExt, err } -func UpdateSkuName(nameID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interface{}, userName string) (num int64, err error) { var err2 error skuName := &model.SkuName{} skuName.ID = nameID @@ -403,7 +404,7 @@ func UpdateSkuName(nameID int, payload map[string]interface{}, userName string) }, model.FieldJdSyncStatus) if err = err2; err == nil { dao.Commit(db) - _, err2 = CurVendorSync.SyncSku(db, nameID, -1, false, userName) + _, err2 = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, userName) } } } @@ -416,7 +417,7 @@ func UpdateSkuName(nameID int, payload map[string]interface{}, userName string) return num, err } -func DeleteSkuName(nameID int, userName string) (num int64, err error) { +func DeleteSkuName(ctx *jxcontext.Context, nameID int, userName string) (num int64, err error) { db := dao.GetDB() dao.Begin(db) defer func() { @@ -438,7 +439,7 @@ func DeleteSkuName(nameID int, userName string) (num int64, err error) { if err2 == nil { dao.Commit(db) if num2 > 0 { - _, err = CurVendorSync.SyncSku(db, skuName.ID, -1, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, userName) } return num, err } @@ -447,18 +448,18 @@ func DeleteSkuName(nameID int, userName string) (num int64, err error) { return num, err } -func AddSku(nameID int, sku *model.Sku, userName string) (outSkuNameExt *model.SkuNameExt, err error) { +func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string) (outSkuNameExt *model.SkuNameExt, err error) { db := dao.GetDB() dao.WrapAddIDCULDEntity(sku, userName) sku.JdSyncStatus = model.SyncFlagNewMask sku.NameID = nameID sku.JdID = jxutils.GenFakeID() if err = dao.CreateEntity(db, sku); err == nil { - result, err2 := GetSkuNames("", utils.Params2Map("skuID", sku.ID), 0, 0) + result, err2 := GetSkuNames(ctx, "", utils.Params2Map("skuID", sku.ID), 0, 0) if err = err2; err == nil { if result.TotalCount == 1 { outSkuNameExt = result.SkuNames[0] - _, err = CurVendorSync.SyncSku(db, outSkuNameExt.SkuName.ID, sku.ID, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, outSkuNameExt.SkuName.ID, sku.ID, false, userName) } else { err = ErrEntityNotExist } @@ -467,7 +468,7 @@ func AddSku(nameID int, sku *model.Sku, userName string) (outSkuNameExt *model.S return outSkuNameExt, err } -func UpdateSku(skuID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}, userName string) (num int64, err error) { sku := &model.Sku{} sku.ID = skuID valid := dao.NormalMakeMapByStructObject(payload, sku, userName) @@ -475,7 +476,7 @@ func UpdateSku(skuID int, payload map[string]interface{}, userName string) (num db := dao.GetDB() if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, sku, valid, userName, nil, model.FieldJdSyncStatus); err == nil { if num == 1 { - _, err = CurVendorSync.SyncSku(db, -1, sku.ID, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, userName) } else { err = ErrEntityNotExist } @@ -484,7 +485,7 @@ func UpdateSku(skuID int, payload map[string]interface{}, userName string) (num return num, err } -func DeleteSku(skuID int, userName string) (num int64, err error) { +func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, err error) { db := dao.GetDB() sku := &model.Sku{} sku.ID = skuID @@ -493,7 +494,7 @@ func DeleteSku(skuID int, userName string) (num int64, err error) { model.FieldJdSyncStatus: model.SyncFlagDeletedMask, }, userName, nil); err == nil { if num == 1 { - _, err = CurVendorSync.SyncSku(db, -1, sku.ID, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, userName) } else { err = ErrEntityNotExist } @@ -501,7 +502,7 @@ func DeleteSku(skuID int, userName string) (num int64, err error) { return num, err } -func AddSkuNamePlace(nameID, placeCode int, userName string) (outPlaceBind *model.SkuNamePlaceBind, err error) { +func AddSkuNamePlace(ctx *jxcontext.Context, nameID, placeCode int, userName string) (outPlaceBind *model.SkuNamePlaceBind, err error) { db := dao.GetDB() placeBind := &model.SkuNamePlaceBind{ NameID: nameID, @@ -509,19 +510,19 @@ func AddSkuNamePlace(nameID, placeCode int, userName string) (outPlaceBind *mode } dao.WrapAddIDCULEntity(placeBind, userName) if err = dao.CreateEntity(db, placeBind); err == nil { - _, err = CurVendorSync.SyncSku(db, nameID, -1, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, userName) } return placeBind, err } -func DeleteSkuNamePlace(nameID, placeCode int, userName string) (num int64, err error) { +func DeleteSkuNamePlace(ctx *jxcontext.Context, nameID, placeCode int, userName string) (num int64, err error) { db := dao.GetDB() placeBind := &model.SkuNamePlaceBind{} placeBind.NameID = nameID placeBind.PlaceCode = placeCode if num, err = dao.DeleteEntity(db, placeBind, model.FieldNameID, model.FieldPlaceCode); err == nil { if num == 1 { - _, err = CurVendorSync.SyncSku(db, nameID, -1, false, userName) + _, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, userName) } else { err = ErrEntityNotExist } @@ -529,7 +530,7 @@ func DeleteSkuNamePlace(nameID, placeCode int, userName string) (num int64, err return num, err } -func GetVendorSku(vendorID int, vendorSkuID string) (skuNameInfo *model.SkuNameExt, err error) { +func GetVendorSku(ctx *jxcontext.Context, vendorID int, vendorSkuID string) (skuNameInfo *model.SkuNameExt, err error) { if handler := CurVendorSync.GetMultiStoreHandler(vendorID); handler != nil { return handler.ReadSku(vendorSkuID) } diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 9f5828ccf..7907c5914 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/legacymodel" @@ -41,7 +42,7 @@ var ( ) // todo 门店绑定信息可以考虑以数组形式返回，而不是现在这样 -func GetStores(keyword string, params map[string]interface{}, offset, pageSize int) (retVal *StoresInfo, err error) { +func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interface{}, offset, pageSize int) (retVal *StoresInfo, err error) { sqlWhere := ` FROM store t1 LEFT JOIN place city ON t1.city_code = city.code AND city.level = 2 @@ -165,7 +166,7 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i return retVal, err } -func GetVendorStore(vendorStoreID string, vendorID int) (retVal *StoreExt, err error) { +func GetVendorStore(ctx *jxcontext.Context, vendorStoreID string, vendorID int) (retVal *StoreExt, err error) { if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil { result, err2 := handler.ReadStore(vendorStoreID) if err = err2; err == nil { @@ -186,7 +187,7 @@ func GetVendorStore(vendorStoreID string, vendorID int) (retVal *StoreExt, err e return nil, ErrCanNotFindVendor } -func UpdateStore(storeID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interface{}, userName string) (num int64, err error) { store := &model.Store{} store.ID = storeID valid := dao.NormalMakeMapByStructObject(payload, store, userName) @@ -210,7 +211,7 @@ func UpdateStore(storeID int, payload map[string]interface{}, userName string) ( }, model.FieldSyncStatus) if err = err2; err == nil { dao.Commit(db) - _, err = CurVendorSync.SyncStore(db, -1, store.ID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) } } if err != nil { @@ -220,7 +221,7 @@ func UpdateStore(storeID int, payload map[string]interface{}, userName string) ( return num, err } -func CreateStore(store *model.Store, userName string) (id int, err error) { +func CreateStore(ctx *jxcontext.Context, store *model.Store, userName string) (id int, err error) { existingID := store.ID dao.WrapAddIDCULDEntity(store, userName) store.ID = existingID @@ -230,7 +231,7 @@ func CreateStore(store *model.Store, userName string) (id int, err error) { return 0, err } -func GetStoreVendorMaps(db *dao.DaoDB, storeID int, vendorID int) (storeMaps []*model.StoreMap, err error) { +func GetStoreVendorMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vendorID int) (storeMaps []*model.StoreMap, err error) { cond := map[string]interface{}{ model.FieldStoreID: storeID, } @@ -240,7 +241,7 @@ func GetStoreVendorMaps(db *dao.DaoDB, storeID int, vendorID int) (storeMaps []* return storeMaps, dao.GetEntitiesByKV(db, &storeMaps, cond, false) } -func AddStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, storeMap *model.StoreMap, userName string) (outStoreMap *model.StoreMap, err error) { +func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeMap *model.StoreMap, userName string) (outStoreMap *model.StoreMap, err error) { if handler := CurVendorSync.GetMultiStoreHandler(vendorID); handler != nil { store, err2 := handler.ReadStore(storeMap.VendorStoreID) if err = err2; err == nil { @@ -263,7 +264,7 @@ func AddStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, storeMap *model.Sto if err = dao.CreateEntity(db, storeMap); err == nil { dao.Commit(db) outStoreMap = storeMap - _, err = CurVendorSync.SyncStore(db, storeMap.VendorID, storeID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName) } if err != nil { dao.Rollback(db) @@ -275,7 +276,7 @@ func AddStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, storeMap *model.Sto return outStoreMap, err } -func DeleteStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) { +func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) { if db == nil { db = dao.GetDB() } @@ -287,12 +288,12 @@ func DeleteStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, userName string) model.FieldStoreID: storeID, model.FieldVendorID: vendorID, }); err == nil && num > 0 { - _, err = CurVendorSync.SyncStore(db, vendorID, storeID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) } return num, err } -func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) { if db == nil { db = dao.GetDB() } @@ -323,7 +324,7 @@ func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[stri } if err == nil && num > 0 { if valid["status"] != nil { - _, err = CurVendorSync.SyncStore(db, vendorID, storeID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) } } } @@ -331,11 +332,11 @@ func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[stri return num, err } -func DeleteStore(db *dao.DaoDB, storeID int, userName string) (num int64, err error) { +func DeleteStore(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, userName string) (num int64, err error) { return 0, err } -func TmpGetJxBadCommentsNo(storeID int) (count int, err error) { +func TmpGetJxBadCommentsNo(ctx *jxcontext.Context, storeID int) (count int, err error) { db := dao.GetDB() var ctInfo struct { Ct int @@ -346,7 +347,7 @@ func TmpGetJxBadCommentsNo(storeID int) (count int, err error) { return count, err } -func TmpGetJxBadCommentsByStoreId(storeID, page, size, commentType int) (retVal map[string]interface{}, err error) { +func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, storeID, page, size, commentType int) (retVal map[string]interface{}, err error) { db := dao.GetDB() sql := ` SELECT SQL_CALC_FOUND_ROWS * @@ -376,7 +377,7 @@ func TmpGetJxBadCommentsByStoreId(storeID, page, size, commentType int) (retVal return retVal, err } -func GetStoreCourierMaps(db *dao.DaoDB, storeID int, vendorID int) (storeCourierMaps []*model.StoreCourierMap, err error) { +func GetStoreCourierMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vendorID int) (storeCourierMaps []*model.StoreCourierMap, err error) { cond := map[string]interface{}{ model.FieldStoreID: storeID, } @@ -386,7 +387,7 @@ func GetStoreCourierMaps(db *dao.DaoDB, storeID int, vendorID int) (storeCourier return storeCourierMaps, dao.GetEntitiesByKV(db, &storeCourierMaps, cond, false) } -func AddStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, storeCourierMap *model.StoreCourierMap, userName string) (outStoreCourierMap *model.StoreCourierMap, err error) { +func AddStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeCourierMap *model.StoreCourierMap, userName string) (outStoreCourierMap *model.StoreCourierMap, err error) { if handler := partner.GetDeliveryPlatformFromVendorID(vendorID); handler != nil { dao.WrapAddIDCULDEntity(storeCourierMap, userName) storeCourierMap.StoreID = storeID @@ -404,7 +405,7 @@ func AddStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, storeCourierMap *m if err = dao.CreateEntity(db, storeCourierMap); err == nil { dao.Commit(db) outStoreCourierMap = storeCourierMap - _, err = CurVendorSync.SyncStore(db, storeCourierMap.VendorID, storeID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, storeCourierMap.VendorID, storeID, false, userName) } if err != nil { dao.Rollback(db) @@ -415,7 +416,7 @@ func AddStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, storeCourierMap *m return outStoreCourierMap, err } -func DeleteStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) { +func DeleteStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) { if db == nil { db = dao.GetDB() } @@ -426,12 +427,12 @@ func DeleteStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, userName string model.FieldStoreID: storeID, model.FieldVendorID: vendorID, }); err == nil && num > 0 { - _, err = CurVendorSync.SyncStore(db, vendorID, storeID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) } return num, err } -func UpdateStoreCourierMap(db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) { +func UpdateStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) { if db == nil { db = dao.GetDB() } diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 5bf2254c8..6fadbdebb 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" @@ -60,7 +61,7 @@ type tStoreSkuBindAndSpec struct { RealSkuID int `orm:"column(real_sku_id)"` } -func GetStoreSkus(storeID int, isFocus bool, keyword string, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *StoreSkuNamesInfo, err error) { +func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword string, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *StoreSkuNamesInfo, err error) { db := dao.GetDB() sql := ` FROM sku_name t1 @@ -229,21 +230,21 @@ func GetStoreSkus(storeID int, isFocus bool, keyword string, params map[string]i return skuNamesInfo, err } -func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string) (num int64, err error) { - return UpdateStoreSkus(storeID, []*StoreSkuBindInfo{skuBindInfo}, userName) +func UpdateStoreSku(ctx *jxcontext.Context, storeID int, skuBindInfo *StoreSkuBindInfo, userName string) (num int64, err error) { + return UpdateStoreSkus(ctx, storeID, []*StoreSkuBindInfo{skuBindInfo}, userName) } -func UpdateStoreSkus(storeID int, skuBindInfos []*StoreSkuBindInfo, userName string) (num int64, err error) { - skuIDs, err := updateStoreSkusWithoutSync(storeID, skuBindInfos, userName) +func UpdateStoreSkus(ctx *jxcontext.Context, storeID int, skuBindInfos []*StoreSkuBindInfo, userName string) (num int64, err error) { + skuIDs, err := updateStoreSkusWithoutSync(ctx, storeID, skuBindInfos, userName) if err == nil { db := dao.GetDB() - _, err = CurVendorSync.SyncStoresSkus(db, nil, []int{storeID}, skuIDs, false, userName) + _, err = CurVendorSync.SyncStoresSkus(ctx, db, nil, []int{storeID}, skuIDs, false, userName) return int64(len(skuIDs)), err } return 0, err } -func updateStoreSkusWithoutSync(storeID int, skuBindInfos []*StoreSkuBindInfo, userName string) (needSyncSkus []int, err error) { +func updateStoreSkusWithoutSync(ctx *jxcontext.Context, storeID int, skuBindInfos []*StoreSkuBindInfo, userName string) (needSyncSkus []int, err error) { var num int64 db := dao.GetDB() needSyncIDMap := make(map[int]int) @@ -371,9 +372,9 @@ func updateStoreSkusWithoutSync(storeID int, skuBindInfos []*StoreSkuBindInfo, u return skuIDs, err } -func UpdateStoresSkus(storeIDs []int, skuBindInfos []*StoreSkuBindInfo, userName string) (num int64, err error) { +func UpdateStoresSkus(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, userName string) (num int64, err error) { for _, storeID := range storeIDs { - skuIDs, err2 := updateStoreSkusWithoutSync(storeID, skuBindInfos, userName) + skuIDs, err2 := updateStoreSkusWithoutSync(ctx, storeID, skuBindInfos, userName) if err = err2; err != nil { return 0, err } @@ -386,11 +387,11 @@ func UpdateStoresSkus(storeIDs []int, skuBindInfos []*StoreSkuBindInfo, userName } } db := dao.GetDB() - _, err = CurVendorSync.SyncStoresSkus(db, nil, storeIDs, skuIDs, false, userName) + _, err = CurVendorSync.SyncStoresSkus(ctx, db, nil, storeIDs, skuIDs, false, userName) return num, err } -func updateStoreSkusSaleWithoutSync(storeID int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string) (needSyncSkus []int, err error) { +func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string) (needSyncSkus []int, err error) { var num int64 db := dao.GetDB() needSyncIDMap := make(map[int]int) @@ -428,9 +429,9 @@ func updateStoreSkusSaleWithoutSync(storeID int, skuBindSkuInfos []*StoreSkuBind return needSyncSkus, err } -func UpdateStoresSkusSale(storeIDs []int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string) (num int64, err error) { +func UpdateStoresSkusSale(ctx *jxcontext.Context, storeIDs []int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string) (num int64, err error) { for _, storeID := range storeIDs { - skuIDs, err2 := updateStoreSkusSaleWithoutSync(storeID, skuBindSkuInfos, userName) + skuIDs, err2 := updateStoreSkusSaleWithoutSync(ctx, storeID, skuBindSkuInfos, userName) if err = err2; err != nil { return 0, err } @@ -441,11 +442,11 @@ func UpdateStoresSkusSale(storeIDs []int, skuBindSkuInfos []*StoreSkuBindSkuInfo skuIDs = append(skuIDs, v.SkuID) } db := dao.GetDB() - _, err = CurVendorSync.SyncStoresSkus(db, nil, storeIDs, skuIDs, false, userName) + _, err = CurVendorSync.SyncStoresSkus(ctx, db, nil, storeIDs, skuIDs, false, userName) return num, err } -func CopyStoreSkus(fromStoreID, toStoreID int, copyMode string, params map[string]interface{}, userName string) (num int64, err error) { +func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode string, params map[string]interface{}, userName string) (num int64, err error) { if copyMode != CopyStoreSkuModeFresh && copyMode != CopyStoreSkuModeUpdate { return 0, fmt.Errorf("不支持的拷贝模式：%s", copyMode) } diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 1a405c9e8..5af143ae7 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -119,7 +120,7 @@ func (v *VendorSync) GetSingleStoreHandler(vendorID int) partner.ISingleStoreHan return nil } -func (v *VendorSync) syncCategories(parentTask tasksch.ITask, multiStoresHandler partner.IMultipleStoresHandler, db *dao.DaoDB, cats []*model.SkuCategory, userName string) (err error) { +func (v *VendorSync) syncCategories(ctx *jxcontext.Context, multiStoresHandler partner.IMultipleStoresHandler, db *dao.DaoDB, cats []*model.SkuCategory, userName string) (err error) { syncStatusFieldName := multiStoresHandler.GetFieldSyncStatusName() task := tasksch.RunParallelTask("syncCategories", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { cat := batchItemList[0].(*model.SkuCategory) @@ -139,14 +140,14 @@ func (v *VendorSync) syncCategories(parentTask tasksch.ITask, multiStoresHandler } return nil, err }, cats) - parentTask.AddChild(task) + ctx.SetTaskOrAddChild(task) _, err = task.GetResult(0) return err } -func (v *VendorSync) SyncCategory(db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { +func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debug(v.MultiStoreVendorIDs) - hint, err = v.LoopMultiStoresVendors(db, "SyncCategory", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + hint, err = v.LoopMultiStoresVendors(ctx, db, "SyncCategory", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { multiStoresHandler := v.GetMultiStoreHandler(batchItemList[0].(int)) var cats []*model.SkuCategory cond := make(map[string]interface{}) @@ -157,7 +158,7 @@ func (v *VendorSync) SyncCategory(db *dao.DaoDB, categoryID int, isAsync bool, u } err := dao.GetEntitiesByKV(db, &cats, cond, true) if err == nil { - err = v.syncCategories(t, multiStoresHandler, db, cats, userName) + err = v.syncCategories(ctx, multiStoresHandler, db, cats, userName) } if err != nil || categoryID > 0 { return nil, err @@ -165,15 +166,15 @@ func (v *VendorSync) SyncCategory(db *dao.DaoDB, categoryID int, isAsync bool, u cond[model.FieldLevel] = 2 err = dao.GetEntitiesByKV(db, &cats, cond, true) if err == nil { - err = v.syncCategories(t, multiStoresHandler, db, cats, userName) + err = v.syncCategories(ctx, multiStoresHandler, db, cats, userName) } return nil, err }) return "", err } -func (v *VendorSync) SyncReorderCategories(db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { - hint, err = v.LoopMultiStoresVendors(db, "SyncReorderCategories", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { +func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { + hint, err = v.LoopMultiStoresVendors(ctx, db, "SyncReorderCategories", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { multiStoresHandler := v.GetMultiStoreHandler(batchItemList[0].(int)) err2 := multiStoresHandler.ReorderCategories(db, categoryID, userName) if err2 == nil { @@ -186,9 +187,9 @@ func (v *VendorSync) SyncReorderCategories(db *dao.DaoDB, categoryID int, isAsyn return "", err } -func (v *VendorSync) SyncStore(db *dao.DaoDB, vendorID, storeID int, isAsync bool, userName string) (hint string, err error) { +func (v *VendorSync) SyncStore(ctx *jxcontext.Context, db *dao.DaoDB, vendorID, storeID int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debugf("SyncStore, storeID:%d", storeID) - hint, err = v.LoopStoreMap(db, "SyncStore", isAsync, userName, storeID, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + hint, err = v.LoopStoreMap(ctx, db, "SyncStore", isAsync, userName, storeID, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { storeMap := batchItemList[0].(*model.StoreMap) if (vendorID == -1 || vendorID == storeMap.VendorID) && (storeMap.SyncStatus != 0) { if handler := v.GetStoreHandler(storeMap.VendorID); handler != nil { @@ -203,9 +204,9 @@ func (v *VendorSync) SyncStore(db *dao.DaoDB, vendorID, storeID int, isAsync boo return "", err } -func (v *VendorSync) SyncSku(db *dao.DaoDB, nameID, skuID int, isAsync bool, userName string) (hint string, err error) { +func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debugf("SyncSku, nameID:%d, skuID:%d, userName:%s", nameID, skuID, userName) - hint, err = v.LoopMultiStoresVendors(db, "SyncSku", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + hint, err = v.LoopMultiStoresVendors(ctx, db, "SyncSku", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { multiStoresHandler := v.GetMultiStoreHandler(batchItemList[0].(int)) syncStatusFieldName := multiStoresHandler.GetFieldSyncStatusName() var skuList []*model.Sku @@ -248,9 +249,9 @@ func (v *VendorSync) SyncSku(db *dao.DaoDB, nameID, skuID int, isAsync bool, use } // -func (v *VendorSync) SyncStoresSkus(db *dao.DaoDB, vendorIDs []int, storeIDs []int, skuIDs []int, isAsync bool, userName string) (hint string, err error) { +func (v *VendorSync) SyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, skuIDs []int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debug("SyncStoresSkus") - hint, err = v.LoopStoreVendors(db, vendorIDs, "SyncStoresSkus", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + hint, err = v.LoopStoreVendors(ctx, db, vendorIDs, "SyncStoresSkus", isAsync, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { handler := v.GetStoreHandler(batchItemList[0].(int)) _, err = handler.SyncStoresSkus(db, storeIDs, skuIDs, false, userName) return nil, err @@ -258,10 +259,11 @@ func (v *VendorSync) SyncStoresSkus(db *dao.DaoDB, vendorIDs []int, storeIDs []i return hint, err } -func (v *VendorSync) LoopStoreMap(db *dao.DaoDB, taskName string, isAsync bool, userName string, storeID int, handler tasksch.WorkFunc) (hint string, err error) { - storeMaps, err := GetStoreVendorMaps(db, storeID, -1) +func (v *VendorSync) LoopStoreMap(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync bool, userName string, storeID int, handler tasksch.WorkFunc) (hint string, err error) { + storeMaps, err := GetStoreVendorMaps(ctx, db, storeID, -1) if err == nil { task := tasksch.RunManagedParallelTask(taskName, nil, userName, handler, storeMaps) + ctx.SetTaskOrAddChild(task) hint = task.ID if !isAsync { _, err = task.GetResult(0) @@ -270,18 +272,19 @@ func (v *VendorSync) LoopStoreMap(db *dao.DaoDB, taskName string, isAsync bool, return hint, makeSyncError(err) } -func (v *VendorSync) LoopMultiStoresVendors(db *dao.DaoDB, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { +func (v *VendorSync) LoopMultiStoresVendors(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { if taskName == "" { taskName = "LoopMultiStoresVendors" } task := tasksch.RunManagedParallelTask(taskName, nil, userName, handler, v.MultiStoreVendorIDs) + ctx.SetTaskOrAddChild(task) if !isAsync { _, err = task.GetResult(0) } return task.ID, makeSyncError(err) } -func (v *VendorSync) LoopStoreVendors(db *dao.DaoDB, vendorIDs []int, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { +func (v *VendorSync) LoopStoreVendors(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { if taskName == "" { taskName = "LoopStoreVendors" } @@ -306,13 +309,14 @@ func (v *VendorSync) LoopStoreVendors(db *dao.DaoDB, vendorIDs []int, taskName s allHandlers = allHandlers[:count] } task := tasksch.RunManagedParallelTask(taskName, nil, userName, handler, allHandlers) + ctx.SetTaskOrAddChild(task) if !isAsync { _, err = task.GetResult(0) } return task.ID, err } -func (v *VendorSync) LoopSingleStoreVendors(db *dao.DaoDB, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { +func (v *VendorSync) LoopSingleStoreVendors(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync bool, userName string, handler tasksch.WorkFunc) (hint string, err error) { if taskName == "" { taskName = "LoopSingleStoreVendors" } @@ -322,6 +326,7 @@ func (v *VendorSync) LoopSingleStoreVendors(db *dao.DaoDB, taskName string, isAs FROM store_map WHERE vendor_id IN (`+dao.GenQuestionMarks(len(v.SingleStoreVendorIDs))+")", v.SingleStoreVendorIDs); err == nil { task := tasksch.RunManagedParallelTask(taskName, nil, userName, handler, storeMaps) + ctx.SetTaskOrAddChild(task) hint = task.ID if !isAsync { _, err = task.GetResult(0) @@ -330,7 +335,7 @@ func (v *VendorSync) LoopSingleStoreVendors(db *dao.DaoDB, taskName string, isAs return hint, makeSyncError(err) } -func (v *VendorSync) RefreshSkuIDs(nameID, skuID int, userName string) (err error) { +func (v *VendorSync) RefreshSkuIDs(ctx *jxcontext.Context, nameID, skuID int, userName string) (err error) { sql := ` SELECT t1.id FROM sku t1 @@ -351,7 +356,7 @@ func (v *VendorSync) RefreshSkuIDs(nameID, skuID int, userName string) (err erro db := dao.GetDB() if err = dao.GetRows(db, &ids, sql, sqlParams); err == nil { // globals.SugarLogger.Debug(utils.Format4Output(ids, false)) - _, err = v.LoopMultiStoresVendors(db, "RefreshSkuIDs", false, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { + _, err = v.LoopMultiStoresVendors(ctx, db, "RefreshSkuIDs", false, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { multiStoresHandler := v.GetMultiStoreHandler(batchItemList[0].(int)) err := multiStoresHandler.SyncSkusIDMap(db, ids, userName) globals.SugarLogger.Debug(err) diff --git a/business/jxstore/cms/user.go b/business/jxstore/cms/user.go index 5597ec8c3..cbb3dc846 100644 --- a/business/jxstore/cms/user.go +++ b/business/jxstore/cms/user.go @@ -4,6 +4,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals" @@ -17,7 +18,7 @@ type StoreUserInfo struct { MembersStr string `json:"-"` } -func GetStoreUsers(storeID int) (storeUserInfos []*StoreUserInfo, err error) { +func GetStoreUsers(ctx *jxcontext.Context, storeID int) (storeUserInfos []*StoreUserInfo, err error) { sql := ` SELECT t1.id, t1.jxstoreid, t1.openid, t1.tel, t1.nickname, t1.parentid, t3.tel parent_mobile, CONCAT("[", GROUP_CONCAT(CONCAT('{"id":', t2.id, ',"parentID":', t2.parentid, ',"openID":"', IF(t2.openid IS NULL, "", t2.openid), '","tel":"', t2.tel, '","nickname":"', IF(t2.nickname IS NULL, "", t2.nickname), '"}')), "]") members_str @@ -37,7 +38,7 @@ func GetStoreUsers(storeID int) (storeUserInfos []*StoreUserInfo, err error) { return storeUserInfos, err } -func GetUserInfo(mobile string) (storeUserInfo *StoreUserInfo, err error) { +func GetUserInfo(ctx *jxcontext.Context, mobile string) (storeUserInfo *StoreUserInfo, err error) { sql := ` SELECT t1.id, t1.jxstoreid, t1.openid, t1.tel, t1.nickname, t1.parentid, t3.tel parent_mobile, CONCAT("[", GROUP_CONCAT(CONCAT('{"id":', t2.id, ',"openID":"', IF(t2.openid IS NULL, "", t2.openid), '","tel":"', t2.tel, '","nickname":"', IF(t2.nickname IS NULL, "", t2.nickname), '"}')), "]") members_str @@ -56,7 +57,7 @@ func GetUserInfo(mobile string) (storeUserInfo *StoreUserInfo, err error) { return storeUserInfo, err } -func GetSelfInfo(openID string) (storeUserInfo *StoreUserInfo, err error) { +func GetSelfInfo(ctx *jxcontext.Context, openID string) (storeUserInfo *StoreUserInfo, err error) { sql := ` SELECT t1.id, t1.jxstoreid, t1.openid, t1.tel, t1.nickname, t1.parentid, t3.tel parent_mobile, CONCAT("[", GROUP_CONCAT(CONCAT('{"id":', t2.id, ',"openID":"', IF(t2.openid IS NULL, "", t2.openid), '","tel":"', t2.tel, '","nickname":"', IF(t2.nickname IS NULL, "", t2.nickname), '"}')), "]") members_str @@ -76,7 +77,7 @@ func GetSelfInfo(openID string) (storeUserInfo *StoreUserInfo, err error) { return storeUserInfo, err } -func UnbindMobile(mobile string) (num int64, err error) { +func UnbindMobile(ctx *jxcontext.Context, mobile string) (num int64, err error) { return dao.UpdateEntityByKV(nil, &legacymodel.WeiXins{}, map[string]interface{}{ "JxStoreID": nil, "ParentID": -1, @@ -85,7 +86,7 @@ func UnbindMobile(mobile string) (num int64, err error) { }) } -func BindMobile2Store(mobile string, storeID int) (num int64, err error) { +func BindMobile2Store(ctx *jxcontext.Context, mobile string, storeID int) (num int64, err error) { db := dao.GetDB() user, err2 := verifyMobileIsBlank(db, mobile) if err = err2; err == nil || err == orm.ErrNoRows { @@ -102,7 +103,7 @@ func BindMobile2Store(mobile string, storeID int) (num int64, err error) { return num, err } -func AddMobile2Mobile(parentMobile, mobile string) (num int64, err error) { +func AddMobile2Mobile(ctx *jxcontext.Context, parentMobile, mobile string) (num int64, err error) { db := dao.GetDB() parentUser := &legacymodel.WeiXins{} parentUser.Tel = parentMobile @@ -129,7 +130,7 @@ func AddMobile2Mobile(parentMobile, mobile string) (num int64, err error) { return num, err } -func ChangeMobile(curMobile, expectedMobile string) (num int64, err error) { +func ChangeMobile(ctx *jxcontext.Context, curMobile, expectedMobile string) (num int64, err error) { return dao.UpdateEntityByKV(nil, &legacymodel.WeiXins{}, map[string]interface{}{ "Tel": expectedMobile, }, map[string]interface{}{ diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index a754ebb6e..0f6336994 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -11,6 +11,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -25,7 +26,7 @@ type tUploadFileInfo struct { StoreID int } -func SendFilesToStores(files []*multipart.FileHeader, isAsync bool, userName string) (hint string, err error) { +func SendFilesToStores(ctx *jxcontext.Context, files []*multipart.FileHeader, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debugf("SendFilesToStores, fileCount:%d isAsync:%t, userName:%s", len(files), isAsync, userName) if len(files) == 0 { return "", errors.New("没有文件上传！") diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go index 518deb718..ba347b970 100644 --- a/business/jxstore/promotion/jd_promotion.go +++ b/business/jxstore/promotion/jd_promotion.go @@ -11,6 +11,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/excel" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -132,7 +133,7 @@ func init() { gob.Register([]*SkuPrice{}) } -func CreateJdPromotion(isIDJd bool, isAsync bool, params *PromotionParams, userName string) (hint string, err error) { +func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync bool, params *PromotionParams, userName string) (hint string, err error) { if len(params.SkuPrices) == 0 { return "", ErrEmptySkus } @@ -306,7 +307,7 @@ func CreateJdPromotion(isIDJd bool, isAsync bool, params *PromotionParams, userN return rootTask.ID, err } -func CreatePromotionByExcel(isAsync bool, promotionType int, fileHeader *multipart.FileHeader, userName string) (hint string, err error) { +func CreatePromotionByExcel(ctx *jxcontext.Context, isAsync bool, promotionType int, fileHeader *multipart.FileHeader, userName string) (hint string, err error) { file, err := fileHeader.Open() if err != nil { return hint, err @@ -353,7 +354,7 @@ func CreatePromotionByExcel(isAsync bool, promotionType int, fileHeader *multipa } // globals.SugarLogger.Debug(utils.Format4Output(promotionParams, false)) // globals.SugarLogger.Debug(isAsync) - return CreateJdPromotion(true, isAsync, promotionParams, userName) + return CreateJdPromotion(ctx, true, isAsync, promotionParams, userName) } func excelStr2Time(timeStr string) (tm time.Time, err error) { diff --git a/business/jxstore/promotion/promotion.go b/business/jxstore/promotion/promotion.go index 0eda2ef73..f8bb96924 100644 --- a/business/jxstore/promotion/promotion.go +++ b/business/jxstore/promotion/promotion.go @@ -7,6 +7,7 @@ import ( "github.com/KenmyZhang/aliyun-communicate" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" @@ -21,7 +22,7 @@ type tMobileInfo struct { Mobile string } -func SendAdvertingByGoodsOrder(advertising string, days int, isAsync bool, userName string) (hint string, err error) { +func SendAdvertingByGoodsOrder(ctx *jxcontext.Context, advertising string, days int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debugf("SendAdvertingByGoodsOrder advertising:%s, days:%d, isAsync:%t, userName:%s", advertising, days, isAsync, userName) if days == 0 { diff --git a/business/jxutils/jxcontext/jxcontext.go b/business/jxutils/jxcontext/jxcontext.go index dc26a7243..4202c6c15 100644 --- a/business/jxutils/jxcontext/jxcontext.go +++ b/business/jxutils/jxcontext/jxcontext.go @@ -4,30 +4,49 @@ import ( "net/http" "sync" + "git.rosy.net.cn/jx-callback/business/jxcallback/auth" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" ) type Context struct { rootTask tasksch.ITask token string + userInfo *auth.LoginInfo w http.ResponseWriter r *http.Request mapData map[interface{}]interface{} locker sync.RWMutex } +var ( + AdminCtx *Context +) + +func init() { + AdminCtx, _, _ = New(nil, "jxadmin", nil, nil) +} + func New(rootTask tasksch.ITask, token string, w http.ResponseWriter, r *http.Request) (ctx *Context, errCode string, err error) { - return &Context{ + ctx = &Context{ rootTask: rootTask, token: token, w: w, r: r, mapData: make(map[interface{}]interface{}), - }, "", nil + } + ctx.userInfo, err = auth.GetUserInfo(token) + return ctx, "", nil } func (ctx *Context) GetUserName() string { - return ctx.token + userName := ctx.token + if ctx.userInfo != nil { + userName = ctx.userInfo.ID + } + if len(userName) > 10 { + userName = userName[:10] + } + return userName } func (ctx *Context) GetUserID() string { @@ -41,7 +60,7 @@ func (ctx *Context) GetRootTask() tasksch.ITask { return ctx.rootTask } -func (ctx *Context) TaskCreated(task tasksch.ITask) bool { +func (ctx *Context) SetTaskOrAddChild(task tasksch.ITask) bool { ctx.locker.Lock() if ctx.rootTask == nil { diff --git a/controllers/cms.go b/controllers/cms.go index f014be09f..55f14bc10 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -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 }) } diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 04165353a..85b826c29 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -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 }) } diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 4000f00c9..c72463d4a 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -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 }) } diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index d80237a36..d8292d42b 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -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 diff --git a/controllers/cms_user.go b/controllers/cms_user.go index 6b42a1fc5..0cc9de143 100644 --- a/controllers/cms_user.go +++ b/controllers/cms_user.go @@ -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 }) } diff --git a/controllers/financial.go b/controllers/financial.go index 4f78cfedb..b15d71ccd 100644 --- a/controllers/financial.go +++ b/controllers/financial.go @@ -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 }) } diff --git a/controllers/jx_order.go b/controllers/jx_order.go index ce0e707d2..671a11be8 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -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 }) } diff --git a/controllers/promotion.go b/controllers/promotion.go index b534575da..a58790981 100644 --- a/controllers/promotion.go +++ b/controllers/promotion.go @@ -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 }) }