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

1

Browse Source
This commit is contained in:
邹宗楠
2025-02-12 13:40:45 +08:00
parent 234a37619d
commit db7b4734a8
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
skuName.ID = nameID
db := dao.GetDB()
if err = dao.GetEntity(db, skuName); err != nil {
globals.SugarLogger.Debugf("----------1 : %v", err)
return 0, err
}
var beforSkuName = *skuName
@@ -983,7 +982,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
return 0, errors.New("商品有Upc码时，规格不能为份")
}
}
globals.SugarLogger.Debugf("----------2 : %v", err)
// globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
// for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
// if valid[imgName] != nil {
@@ -1001,7 +999,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
if descImg != "" {
_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name+"_desc", descImg, model.ImgTypeDesc, false)
if err = err2; err != nil {
globals.SugarLogger.Debugf("----------3 : %v", err)
return 0, err
}
}
@@ -1029,13 +1026,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
}
}()
if num, err = dao.UpdateEntityLogically(db, skuName, valid, userName, nil); err != nil {
globals.SugarLogger.Debugf("---------4 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}
if !isExd && eclpID == "" {
if err = OnUpdateThing(ctx, db, nil, int64(nameID), model.ThingTypeSkuName); err != nil {
globals.SugarLogger.Debugf("----------5 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}
@@ -1044,7 +1039,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
if utils.Interface2Int64WithDefault(payload["isGlobal"], 0) == 0 && payload["places"] != nil {
if places, ok := payload["places"].([]interface{}); ok {
if _, err = dao.DeleteSkuNamePlace(db, nameID, nil); err != nil {
globals.SugarLogger.Debugf("----------6 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}
@@ -1055,7 +1049,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.WrapAddIDCULEntity(placeBind, userName)
placeBind.NameID = nameID
err = dao.CreateEntity(db, placeBind)
globals.SugarLogger.Debugf("----------7 : %v", err)
} else {
dao.Rollback(db, txDB)
return 0, errors.New("地点代码非法")
@@ -1064,7 +1057,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
}
}
skuList, err2 := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
globals.SugarLogger.Debugf("----------8 : %v", err2)
if err = err2; err == nil {
for _, v := range skuList {
sku := &v.Sku
@@ -1072,13 +1064,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
sku.LastOperator = userName
sku.UpdatedAt = time.Now()
if _, err = dao.UpdateEntity(db, sku); err != nil {
globals.SugarLogger.Debugf("----------9 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}
if sku.ExdSkuID == "" && sku.EclpID == "" {
if err = OnUpdateThing(ctx, db, nil, int64(v.ID), model.ThingTypeSku); err != nil {
globals.SugarLogger.Debugf("----------10: %v", err)
dao.Rollback(db, txDB)
return 0, err
}
@@ -1087,7 +1077,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
}
skuIDs, err2 := dao.GetSkuIDByNames(db, []int{nameID})
if err = err2; err != nil {
globals.SugarLogger.Debugf("----------11 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}
@@ -1116,7 +1105,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
// 更新skuIds对应在store_sku_bind中的价格体系,解决老版本改价之前关注的商品,在价格修改后,store_sku_bind中京西价未修改的问题
if _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask); err != nil {
globals.SugarLogger.Debugf("----------12 : %v", err)
dao.Rollback(db, txDB)
return 0, err
}

3
business/model/dao/dao_bz.go
View File

@@ -54,7 +54,10 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c
qs = qs.Filter(k, v)
}
}
globals.SugarLogger.Debugf("-------item %s", utils.Format4Output(item, false))
globals.SugarLogger.Debugf("-------kvs %s", utils.Format4Output(kvs, false))
num, err = qs.Update(kvs)
globals.SugarLogger.Debugf("-------err %v", err)
if err != nil && !IsDuplicateError(err) {
globals.SugarLogger.Errorf("UpdateEntityByKV %s failed with error:%v", reflect.TypeOf(item).Name(), err)
}