diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 195a5a125..a1821b0d6 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -47,10 +47,28 @@ func GetCategories(ctx *jxcontext.Context, parentID int) (cats []*model.SkuCateg } func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string) (outCat *model.SkuCategory, err error) { + db := dao.GetDB() + if cat.Level < 0 || cat.Level > 2 { + return nil, errors.New("Level必须为1或2") + } else if cat.Level == 1 && cat.ParentID != 0 { + return nil, errors.New("Level1的分类其父分类必须为0") + } else if cat.Level == 2 { + if cat.ParentID == 0 { + return nil, errors.New("Level2的分类其父分类必须不为0") + } + parentCat := &model.SkuCategory{} + parentCat.ID = cat.ParentID + if err = dao.GetEntity(db, parentCat); err != nil { + return nil, err + } + if parentCat.Level != 1 { + return nil, errors.New("Level2的分类其父分类必须为Level1分类") + } + } + dao.WrapAddIDCULDEntity(cat, userName) cat.JdSyncStatus = model.SyncFlagNewMask cat.JdID = jxutils.GenFakeID() - db := dao.GetDB() if cat.Seq <= 0 { var maxSeq struct { MaxSeq int diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index b6296bca8..66ab58468 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -215,7 +215,7 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask task1 := tasksch.NewParallelTask(taskName, nil, ctx.GetUserName(), func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { store := batchItemList[0].(*tJdStoreInfo) storeParams := map[string]interface{}{ - "outSystemId": store.ID, + "outSystemId": utils.Int2Str(int(store.ID)), } if step == 1 { storeParams["outSystemId"] = utils.GetUUID()