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

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

Browse Source
This commit is contained in:
平凡梦
2020-07-09 09:58:02 +08:00
parent 44b1a3f2c6 518cfab22e
commit 2be65984b9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/store_sku.go
View File

@@ -1052,7 +1052,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
if user := ctx.GetFullUser(); user != nil { if user := ctx.GetFullUser(); user != nil {
isUserCanDirectChangePrice = user.Type&model.UserTypeOperator != 0 isUserCanDirectChangePrice = user.Type&model.UserTypeOperator != 0
} }
fmt.Println("test1")
userName := ctx.GetUserName() userName := ctx.GetUserName()
needSyncIDMap := make(map[int]int) needSyncIDMap := make(map[int]int)
dao.Begin(db) dao.Begin(db)
@@ -1069,7 +1068,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
dao.Rollback(db) dao.Rollback(db)
return nil, err return nil, err
} }
fmt.Println("test2") fmt.Println("test22222222222222222222222222222222222222222")
scaleFactor := float64(1) scaleFactor := float64(1)
if isScale { if isScale {
scaleFactor = 100 / float64(jxutils.ConstrainPayPercentage(storeDetail.PayPercentage)) scaleFactor = 100 / float64(jxutils.ConstrainPayPercentage(storeDetail.PayPercentage))
@@ -1116,7 +1115,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
sqlParams = append(sqlParams, skuBindInfo.NameID, utils.DefaultTimeValue) sqlParams = append(sqlParams, skuBindInfo.NameID, utils.DefaultTimeValue)
// globals.SugarLogger.Debug(sql) // globals.SugarLogger.Debug(sql)
if err = dao.GetRows(db, &allBinds, sql, sqlParams...); err == nil { if err = dao.GetRows(db, &allBinds, sql, sqlParams...); err == nil {
fmt.Println("test3")
if len(allBinds) > 0 { if len(allBinds) > 0 {
// globals.SugarLogger.Debug(utils.Format4Output(allBinds, false)) // globals.SugarLogger.Debug(utils.Format4Output(allBinds, false))
inSkuBinsMap := make(map[int]*StoreSkuBindSkuInfo, len(inSkuBinds)) inSkuBinsMap := make(map[int]*StoreSkuBindSkuInfo, len(inSkuBinds))
@@ -1312,6 +1310,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
} }
} }
} else { } else {
fmt.Println("test3333333333333333333333333333333333333333")
dao.Rollback(db) dao.Rollback(db)
return nil, err return nil, err
} }