Merge remote-tracking branch 'origin/jdshop' into jxact

This commit is contained in:
苏尹岚
2020-08-19 16:03:34 +08:00
3 changed files with 20 additions and 5 deletions

View File

@@ -11,6 +11,8 @@ import (
"strings"
"time"
"github.com/astaxie/beego"
"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
"git.rosy.net.cn/baseapi/utils"
@@ -890,8 +892,11 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
sku := v.Sku
dao.WrapAddIDCULDEntity(sku, userName)
sku.NameID = skuNameExt.ID
// sku.JdSyncStatus = model.SyncFlagNewMask
// sku.JdID = 0
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 50
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 20
}
if err = dao.CreateEntity(db, sku); err != nil {
dao.Rollback(db)
return nil, err
@@ -1225,7 +1230,11 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
// sku.JdSyncStatus = model.SyncFlagNewMask
// sku.JdID = 0
sku.NameID = nameID
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 50
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 20
}
dao.Begin(db)
defer func() {
if r := recover(); r != nil {