From 5089f7efc093a43e35960fc86dc67f311d40f439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sun, 26 Apr 2020 10:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=8F=9C=E5=B8=82=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=88=B0=E6=9E=9C=E5=9B=AD=E6=96=B0=E5=A2=9E=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=8B=E5=8A=A8=EF=BC=8C=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index df33c941b..10677c109 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4371,21 +4371,36 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 						skuNameExt.Unit = skuName.Unit
 						skuNameExt.Name = skuName.Name
 						skuNameExt.Upc = skuName.Upc
-						skuNameExt.SkuName.Status = model.SkuStatusNormal
 						skuNameExt.Img = skuName.Img
 						skuNameExt.Img2 = skuName.Img2
 						skuNameExt.DescImg = skuName.DescImg
 						skuNameExt.Price = skuName.Price
+						skuNameExt.IsGlobal = model.YES
+						skuNameExt.Status = model.SkuStatusNormal
 						skuNameExt.ID = v.NameID
 						skuNameExt.CategoryID = 3024 //默认全放物料分类下
 						skuNameExt.Skus[0].ID = v.ID
 						skuNameExt.Skus[0].SpecQuality = v.SpecQuality
 						skuNameExt.Skus[0].SpecUnit = v.SpecUnit
 						skuNameExt.Skus[0].EclpID = v.EclpID
-						_, err = AddSkuName(ctx, skuNameExt, ctx.GetUserName())
-						if err != nil {
+						skuNameExt.Skus[0].Status = model.SkuStatusNormal
+						skuNameExt.Skus[0].NameID = v.NameID
+						dao.Begin(db)
+						defer func() {
+							if r := recover(); r != nil {
+								dao.Rollback(db)
+								panic(r)
+							}
+						}()
+						if err = dao.CreateEntity(db, skuNameExt.SkuName); err != nil {
+							dao.Rollback(db)
 							return retVal, err
 						}
+						if err = dao.CreateEntity(db, skuNameExt.Skus[0]); err != nil {
+							dao.Rollback(db)
+							return retVal, err
+						}
+						dao.Commit(db)
 						sql = "SELECT * FROM jxd_dev_0.store_sku_bind WHERE store_id = ? AND sku_id = ? "
 						sqlParams2 := []interface{}{model.MatterStoreID, v.ID}
 						err = dao.GetRows(db, &storeSkus, sql, sqlParams2)
@@ -4422,6 +4437,8 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 								panic(r)
 							}
 						}()
+						fmt.Println("test111111111111111111111111", utils.Format4Output(v, false))
+						fmt.Println("test22222222222222222222222222", utils.Format4Output(skuName, false))
 						dao.WrapAddIDCULEntity(v, ctx.GetUserName())
 						if _, err = dao.UpdateEntity(db, v, "SpecQuality", "SpecUnit", "EclpID"); err != nil {
 							dao.Rollback(db)