- 将jdid去掉唯一索引,这样在创建前就可以设置成0值了,不需要再用一个假的ID值
This commit is contained in:
@@ -70,7 +70,7 @@ func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string
|
|||||||
|
|
||||||
dao.WrapAddIDCULDEntity(cat, userName)
|
dao.WrapAddIDCULDEntity(cat, userName)
|
||||||
cat.JdSyncStatus = model.SyncFlagNewMask
|
cat.JdSyncStatus = model.SyncFlagNewMask
|
||||||
cat.JdID = jxutils.GenFakeID()
|
cat.JdID = 0 //jxutils.GenFakeID()
|
||||||
cat.Name = strings.Trim(cat.Name, " ")
|
cat.Name = strings.Trim(cat.Name, " ")
|
||||||
if cat.Seq <= 0 {
|
if cat.Seq <= 0 {
|
||||||
var maxSeq struct {
|
var maxSeq struct {
|
||||||
@@ -473,17 +473,17 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
|
|||||||
dao.Rollback(db)
|
dao.Rollback(db)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
beginJDID := jxutils.GenFakeID()
|
// beginJDID := jxutils.GenFakeID()
|
||||||
for _, sku := range skuNameExt.Skus {
|
for _, sku := range skuNameExt.Skus {
|
||||||
dao.WrapAddIDCULDEntity(sku, userName)
|
dao.WrapAddIDCULDEntity(sku, userName)
|
||||||
sku.NameID = skuNameExt.ID
|
sku.NameID = skuNameExt.ID
|
||||||
sku.JdSyncStatus = model.SyncFlagNewMask
|
sku.JdSyncStatus = model.SyncFlagNewMask
|
||||||
sku.JdID = beginJDID
|
sku.JdID = 0 //beginJDID
|
||||||
if err = dao.CreateEntity(db, sku); err != nil {
|
if err = dao.CreateEntity(db, sku); err != nil {
|
||||||
dao.Rollback(db)
|
dao.Rollback(db)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
beginJDID++
|
// beginJDID++
|
||||||
}
|
}
|
||||||
for _, placeCode := range skuNameExt.Places {
|
for _, placeCode := range skuNameExt.Places {
|
||||||
placeBind := &model.SkuNamePlaceBind{}
|
placeBind := &model.SkuNamePlaceBind{}
|
||||||
@@ -620,7 +620,7 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
|
|||||||
dao.WrapAddIDCULDEntity(sku, userName)
|
dao.WrapAddIDCULDEntity(sku, userName)
|
||||||
sku.JdSyncStatus = model.SyncFlagNewMask
|
sku.JdSyncStatus = model.SyncFlagNewMask
|
||||||
sku.NameID = nameID
|
sku.NameID = nameID
|
||||||
sku.JdID = jxutils.GenFakeID()
|
sku.JdID = 0 //jxutils.GenFakeID()
|
||||||
if err = dao.CreateEntity(db, sku); err == nil {
|
if err = dao.CreateEntity(db, sku); err == nil {
|
||||||
result, err2 := GetSkuNames(ctx, "", false, utils.Params2Map("skuID", sku.ID), 0, 0)
|
result, err2 := GetSkuNames(ctx, "", false, utils.Params2Map("skuID", sku.ID), 0, 0)
|
||||||
if err = err2; err == nil {
|
if err = err2; err == nil {
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr
|
|||||||
skuNew2 := *sku
|
skuNew2 := *sku
|
||||||
skuNew := &skuNew2
|
skuNew := &skuNew2
|
||||||
dao.WrapAddIDCULEntity(skuNew, ctx.GetUserName())
|
dao.WrapAddIDCULEntity(skuNew, ctx.GetUserName())
|
||||||
skuNew.JdID = jxutils.GenFakeID()
|
skuNew.JdID = 0 //jxutils.GenFakeID()
|
||||||
skuNew.LinkID = sku.ID
|
skuNew.LinkID = sku.ID
|
||||||
skuNew.NameID = skuNameNew.ID
|
skuNew.NameID = skuNameNew.ID
|
||||||
skuNew.JdSyncStatus = model.SyncFlagNewMask
|
skuNew.JdSyncStatus = model.SyncFlagNewMask
|
||||||
|
|||||||
@@ -144,6 +144,11 @@ type SkuCategory struct {
|
|||||||
func (*SkuCategory) TableUnique() [][]string {
|
func (*SkuCategory) TableUnique() [][]string {
|
||||||
return [][]string{
|
return [][]string{
|
||||||
[]string{"Name", "Level", "DeletedAt"},
|
[]string{"Name", "Level", "DeletedAt"},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*SkuCategory) TableIndex() [][]string {
|
||||||
|
return [][]string{
|
||||||
[]string{"JdID", "DeletedAt"},
|
[]string{"JdID", "DeletedAt"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user