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

- 在CopyStoreSkus中，修改已有门店商品时，不判断SKU与SKUNAME是否删除

Browse Source
This commit is contained in:
gazebo
2019-03-24 11:35:33 +08:00
parent 495b241caa
commit 8789c158f4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -831,8 +831,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
sqlDelete := ` sqlDelete := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ? JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id/* AND t2.deleted_at = ?*/
JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id/* AND t2.deleted_at = ?*/
LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ?
SET t1.deleted_at = ?, SET t1.deleted_at = ?,
t1.updated_at = ?, t1.updated_at = ?,
@@ -848,8 +848,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
sqlDeleteParams := []interface{}{ sqlDeleteParams := []interface{}{
fromStoreID, fromStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, // utils.DefaultTimeValue,
utils.DefaultTimeValue, // utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
now, now,
now, now,
@@ -882,8 +882,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
sql := ` sql := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ? JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id/* AND t2.deleted_at = ?*/
JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
SET t1.last_operator = ?, SET t1.last_operator = ?,
t1.updated_at = ?, t1.updated_at = ?,
@@ -901,8 +901,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
sqlParams := []interface{}{ sqlParams := []interface{}{
fromStoreID, fromStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, // utils.DefaultTimeValue,
utils.DefaultTimeValue, // utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
userName, userName,
now, now,