From dbff80587425c6eb5ec2ae9a81289c3557d1030d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 21 Feb 2020 13:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A5=BF=E9=B2=9C=E8=BE=BE?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=B9=B6=E5=88=B7=E6=96=B0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 6bf94964b..c058396f4 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1498,13 +1498,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
 					skus.UpcIds,
 				}
 				dao.GetRow(db, skuNameExt, sql2, sqlParams2)
-				dao.Begin(db)
-				defer func() {
-					if r := recover(); r != nil {
-						dao.Rollback(db)
-						panic(r)
-					}
-				}()
 				prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName)
 				//京西库中存在此商品
 				if skuNameExt.ID != 0 {
@@ -1522,9 +1515,8 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
 						flag = true
 					}
 					if flag {
-						_, err = dao.UpdateEntity(db, skuNameExt, "Name")
+						_, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img")
 						if err != nil {
-							dao.Rollback(db)
 							return result, err
 						}
 					}
@@ -1559,7 +1551,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
 					dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName())
 					err = dao.CreateEntity(db, skuName)
 					if err != nil {
-						dao.Rollback(db)
 						return result, err
 					}
 					sku := &model.Sku{
@@ -1574,11 +1565,9 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
 					dao.WrapAddIDCULDEntity(sku, ctx.GetUserName())
 					err = dao.CreateEntity(db, sku)
 					if err != nil {
-						dao.Rollback(db)
 						return result, err
 					}
 				}
-				dao.Commit(db)
 				return retVal, err
 			}
 			taskParallel := tasksch.NewParallelTask("更新京西上饿鲜达商品库", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, results)