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

- move some funcs from jxtools to dao.

Browse Source
This commit is contained in:
gazebo
2018-09-11 11:38:31 +08:00
parent 45ce7352fc
commit 70bf5a522a
8 changed files with 130 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
business/jxstore/cms/sku.go
View File

@@ -5,7 +5,6 @@ import (
"strconv"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
)
@@ -52,9 +51,8 @@ func GetCategories(parentID int) (cats []*model.SkuCategory, err error) {
}
func AddCategory(cat *model.SkuCategory, userName string) (outCat *model.SkuCategory, err error) {
cat.ID = 0
dao.WrapAddIDCULDEntity(cat, userName)
cat.JdSyncStatus = model.SyncFlagNewMask
cat.DeletedAt = utils.DefaultTimeValue
if err = dao.CreateEntity(nil, cat); err == nil {
outCat = cat
err = CurVendorSync.SyncCategory(cat.ID, false, userName)
@@ -65,7 +63,7 @@ func AddCategory(cat *model.SkuCategory, userName string) (outCat *model.SkuCate
func UpdateCategory(categoryID int, payload map[string]interface{}, userName string) (num int64, err error) {
cat := &model.SkuCategory{}
cat.ID = categoryID
valid := jxutils.NormalMakeMapByStructObject(payload, cat, userName)
valid := dao.NormalMakeMapByStructObject(payload, cat, userName)
valid[model.FieldJdSyncStatus] = model.SyncFlagModifiedMask
db := dao.GetDB()
if num, err = dao.UpdateEntityByKV(db, cat, valid, nil); err == nil {
@@ -96,6 +94,7 @@ func ReorderCategories(parentID int, categoryIDs []int, userName string) (err er
break
}
}
// todo 这里应该也需要先置标记
if err == nil {
err = GetPurchaseHandler(model.VendorIDJD).ReorderCategories(parentCat, userName)
}
@@ -262,8 +261,31 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
return skuNamesInfo, err
}
func AddSkuName(skuNameID int, payload map[string]interface{}) (num int64, err error) {
return num, err
func AddSkuName(skuNameExt *SkuNameExt, userName string) (outSkuNameExt *SkuNameExt, err error) {
db := dao.GetDB()
dao.Begin(db)
dao.WrapAddIDCULDEntity(&skuNameExt.SkuName, userName)
if err = dao.CreateEntity(db, &skuNameExt.SkuName); err != nil {
dao.Rollback(db)
return nil, err
}
for _, sku := range skuNameExt.Skus {
dao.WrapAddIDCULDEntity(sku, userName)
if err = dao.CreateEntity(db, sku); err != nil {
dao.Rollback(db)
return nil, err
}
}
dao.Commit(db)
tmpInfo, err := GetSkuNames("", utils.Params2Map("id", skuNameExt.SkuName.ID), 0, 1)
if err != nil {
return nil, err
}
if tmpInfo.TotalCount != 1 {
return nil, ErrEntityNotExist
}
outSkuNameExt = tmpInfo.SkuNames[0]
return outSkuNameExt, err
}
func UpdateSkuName(skuNameID int, payload map[string]interface{}) (num int64, err error) {