From 8789c158f4042ea3645bdf7e7ee0fbaa9ec08674 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 24 Mar 2019 11:35:33 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=9C=A8CopyStoreSkus=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E6=9C=89=E9=97=A8=E5=BA=97=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=88=A4=E6=96=ADSKU?= =?UTF-8?q?=E4=B8=8ESKUNAME=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 6ccbaf51d..352b2489e 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -831,8 +831,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sqlDelete := ` 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 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 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 = ?*/ LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ? SET t1.deleted_at = ?, t1.updated_at = ?, @@ -848,8 +848,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sqlDeleteParams := []interface{}{ fromStoreID, utils.DefaultTimeValue, - utils.DefaultTimeValue, - utils.DefaultTimeValue, + // utils.DefaultTimeValue, + // utils.DefaultTimeValue, utils.DefaultTimeValue, now, now, @@ -882,8 +882,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sql := ` 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 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 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 = ?*/ LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? SET t1.last_operator = ?, t1.updated_at = ?, @@ -901,8 +901,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sqlParams := []interface{}{ fromStoreID, utils.DefaultTimeValue, - utils.DefaultTimeValue, - utils.DefaultTimeValue, + // utils.DefaultTimeValue, + // utils.DefaultTimeValue, utils.DefaultTimeValue, userName, now,