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

- fix bug in CopyStoreSkus

Browse Source
This commit is contained in:
gazebo
2018-10-25 17:26:35 +08:00
parent e8c25cd2b3
commit 086768b4ef
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@ func updateStoreSkusWithoutSync(ctx *jxcontext.Context, storeID int, skuBindInfo
JOIN sku_name t3 ON t1.name_id = t3.id AND t3.deleted_at = ? JOIN sku_name t3 ON t1.name_id = t3.id AND t3.deleted_at = ?
WHERE t1.name_id = ? AND t1.deleted_at = ? WHERE t1.name_id = ? AND t1.deleted_at = ?
`, storeID, utils.DefaultTimeValue, utils.DefaultTimeValue, skuBindInfo.NameID, utils.DefaultTimeValue); err == nil { `, storeID, utils.DefaultTimeValue, utils.DefaultTimeValue, skuBindInfo.NameID, utils.DefaultTimeValue); err == nil {
// globals.SugarLogger.Debug(len(allBinds)) globals.SugarLogger.Debug(utils.Format4Output(allBinds, false))
inSkuBinsMap := make(map[int]*StoreSkuBindSkuInfo, len(inSkuBinds)) inSkuBinsMap := make(map[int]*StoreSkuBindSkuInfo, len(inSkuBinds))
for _, v := range inSkuBinds { for _, v := range inSkuBinds {
inSkuBinsMap[v.SkuID] = v inSkuBinsMap[v.SkuID] = v
@@ -283,6 +283,7 @@ func updateStoreSkusWithoutSync(ctx *jxcontext.Context, storeID int, skuBindInfo
} }
for _, v := range allBinds { for _, v := range allBinds {
inSkuBind := inSkuBinsMap[v.RealSkuID] inSkuBind := inSkuBinsMap[v.RealSkuID]
globals.SugarLogger.Debug(utils.Format4Output(inSkuBind, false))
var skuBind *model.StoreSkuBind var skuBind *model.StoreSkuBind
if v.ID == 0 { if v.ID == 0 {
if skuBindInfo.IsFocus == 1 { if skuBindInfo.IsFocus == 1 {
@@ -500,8 +501,9 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
if copyMode == CopyStoreSkuModeFresh || copyMode == CopyStoreSkuModeUpdate { if copyMode == CopyStoreSkuModeFresh || copyMode == CopyStoreSkuModeUpdate {
sqlDelete := ` sqlDelete := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN sku t2 ON t1.sku_id = t2.id JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ?
SET t1.deleted_at = ?, SET t1.deleted_at = ?,
t1.last_operator = ?, t1.last_operator = ?,
t1.status = ?, t1.status = ?,
@@ -511,6 +513,9 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
WHERE t1.store_id = ? AND t1.deleted_at = ? WHERE t1.store_id = ? AND t1.deleted_at = ?
` `
sqlDeleteParams := []interface{}{ sqlDeleteParams := []interface{}{
utils.DefaultTimeValue,
utils.DefaultTimeValue,
utils.DefaultTimeValue,
time.Now(), time.Now(),
userName, userName,
model.StoreSkuBindStatusDeleted, model.StoreSkuBindStatusDeleted,
@@ -533,9 +538,9 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
SELECT NOW(), NOW(), ?, ?, SELECT NOW(), NOW(), ?, ?,
?, t1.sku_id, 0, t1.price * ? / 100, t1.unit_price * ? / 100, t1.status, ?, ?, ? ?, t1.sku_id, 0, t1.price * ? / 100, t1.unit_price * ? / 100, t1.status, ?, ?, ?
FROM store_sku_bind t1 FROM store_sku_bind t1
JOIN sku t2 ON t1.sku_id = t2.id JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
WHERE t1.store_id = ? AND t1.deleted_at = ? WHERE t1.store_id = ? AND t1.deleted_at = ?
` `
sqlParams := []interface{}{ sqlParams := []interface{}{
@@ -547,6 +552,9 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagNewMask, model.SyncFlagNewMask,
utils.DefaultTimeValue,
utils.DefaultTimeValue,
utils.DefaultTimeValue,
fromStoreID, fromStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }