From 3fe9fd548383946a55b4003c3a375b60db4ab88c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 4 Dec 2019 09:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcms.DeleteStoreSku=E4=B8=AD?=
 =?UTF-8?q?=E6=BC=8F=E8=AE=BE=E7=BD=AE=E7=BE=8E=E5=9B=A2=E5=A4=96=E5=8D=96?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 3528323e4..80d721982 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -624,7 +624,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		dao.WrapAddIDCULDEntity(sku, userName)
 		sku.NameID = skuNameExt.ID
 		sku.JdSyncStatus = model.SyncFlagNewMask
-		sku.JdID = 0 //beginJDID
+		sku.JdID = 0
 		if err = dao.CreateEntity(db, sku); err != nil {
 			dao.Rollback(db)
 			return nil, err
@@ -779,15 +779,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 }
 
 func SetStoreSkuSyncStatus2(db *dao.DaoDB, storeIDs []int, vendorIDs, skuIDs []int, syncStatus int) (num int64, err error) {
-	// dao.Begin(db)
-	// defer func() {
-	// 	if r := recover(); r != nil || err != nil {
-	// 		dao.Rollback(db)
-	// 		if r != nil {
-	// 			panic(r)
-	// 		}
-	// 	}
-	// }()
 	for _, vendorID := range vendorIDs {
 		num2, err2 := dao.SetStoreSkuSyncStatus(db, vendorID, storeIDs, skuIDs, syncStatus)
 		if err = err2; err != nil {
@@ -795,7 +786,6 @@ func SetStoreSkuSyncStatus2(db *dao.DaoDB, storeIDs []int, vendorIDs, skuIDs []i
 		}
 		num += num2
 	}
-	// dao.Commit(db)
 	return num, nil
 }
 
@@ -848,8 +838,8 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 
 	dao.WrapAddIDCULDEntity(sku, userName)
 	sku.JdSyncStatus = model.SyncFlagNewMask
-	sku.NameID = nameID
 	sku.JdID = 0
+	sku.NameID = nameID
 	if err = dao.CreateEntity(db, sku); err == nil {
 		result, err2 := GetSkuNames(ctx, "", false, utils.Params2Map("skuID", sku.ID), 0, 0)
 		if err = err2; err == nil {
@@ -997,6 +987,7 @@ func DeleteStoreSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int) (n
 			storeSkuBind := &model.StoreSkuBind{}
 			_, err = dao.DeleteEntityLogically(db, storeSkuBind, map[string]interface{}{
 				model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
+				model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask,
 				model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
 			}, ctx.GetUserName(), map[string]interface{}{
 				model.FieldSkuID:     v.ID,