diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go index 9e588c1a8..f8afc6384 100644 --- a/business/jxstore/initdata/initdata.go +++ b/business/jxstore/initdata/initdata.go @@ -6,7 +6,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/autonavi" "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" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals/api" @@ -72,60 +71,6 @@ func InitPlace(ctx *jxcontext.Context) (err error) { return err } -func InitVendorCategory(ctx *jxcontext.Context, vendorID int, isAsync bool) (hint string, err error) { - if handler := partner.GetPurchasePlatformFromVendorID(vendorID); handler != nil { - var cats []*model.SkuVendorCategory - rootTask := tasksch.NewSeqTask(fmt.Sprintf("创建%s的平台分类", model.VendorChineseNames[vendorID]), ctx, - func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { - switch step { - case 0: - cats, err = handler.GetVendorCategories(ctx) - if err != nil { - return nil, err - } - case 1: - db := dao.GetDB() - dao.Begin(db) - defer func() { - if r := recover(); r != nil || err != nil { - dao.Rollback(db) - if r != nil { - panic(r) - } - } - }() - sql := ` - DELETE - FROM sku_vendor_category - WHERE vendor_id = ? - ` - if _, err = dao.ExecuteSQL(db, sql, vendorID); err != nil { - return nil, err - } - for _, cat := range cats { - dao.WrapAddIDCULEntity(cat, ctx.GetUserName()) - } - if err = dao.CreateMultiEntities(db, cats); err != nil { - return nil, err - } - dao.Commit(db) - } - return nil, err - }, 2) - tasksch.HandleTask(rootTask, nil, true).Run() - if !isAsync { - if _, err = rootTask.GetResult(0); err == nil { - hint = utils.Int2Str(len(cats)) - } - } else { - hint = rootTask.ID - } - } else { - err = fmt.Errorf("找不到平台:%d", vendorID) - } - return hint, err -} - func UploadImg4Vendors(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) { // db := dao.GetDB() // rootTask := tasksch.NewSeqTask("合并SkuName图片至DataResource", ctx, diff --git a/controllers/cms.go b/controllers/cms.go index d2e9ef319..d6f309c84 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -2,6 +2,7 @@ package controllers import ( "git.rosy.net.cn/jx-callback/business/jxstore/cms" + "git.rosy.net.cn/jx-callback/business/jxstore/initdata" "git.rosy.net.cn/jx-callback/business/jxutils/datares" "github.com/astaxie/beego" ) @@ -100,3 +101,16 @@ func (c *CmsController) GetServiceInfo() { return retVal, "", err }) } + +// @Title init place +// @Description init place +// @Param token header string true "认证token" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /InitPlace [post] +func (c *CmsController) InitPlace() { + c.callInitPlace(func(params *tCmsInitPlaceParams) (retVal interface{}, errCode string, err error) { + err = initdata.InitPlace(params.Ctx) + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index dc912e633..a62c19ade 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -160,6 +160,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], + beego.ControllerComments{ + Method: "InitPlace", + Router: `/InitPlace`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], beego.ControllerComments{ Method: "NewConfig",