From de0cc168f305dd0b57595de1eccaecff59630d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 Jan 2021 14:16:53 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store_sku.go | 13 ++++++++-----
 business/jxstore/cms/sync2.go     |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 73b4846fd..f2cfac981 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1248,24 +1248,27 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 												if thingMaps[0].VendorThingID == "" {
 													//并且同步标志还没有带待创建（因为addskuname现在建到thingmap上不会带待创建标志了）
 													if !model.IsSyncStatusNew(thingMaps[0].SyncStatus) {
-														OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
+														if err = OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
 															&MultiStoreVendorInfo{
 																VendorID: model.VendorIDJD,
 																OrgCode:  list1[0].VendorOrgCode,
 															},
-														}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
+														}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask); err == nil {
+															_, err = SyncSkus(ctx, nil, []int{model.VendorIDJD}, []string{list1[0].VendorOrgCode}, nil, []int{v.RealSkuID}, true)
+														}
 													}
 												}
 											} else {
 												//万一不存在
-												OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
+												if err = OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
 													&MultiStoreVendorInfo{
 														VendorID: model.VendorIDJD,
 														OrgCode:  list1[0].VendorOrgCode,
 													},
-												}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
+												}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask); err == nil {
+													_, err = SyncSkus(ctx, nil, []int{model.VendorIDJD}, []string{list1[0].VendorOrgCode}, nil, []int{v.RealSkuID}, true)
+												}
 											}
-											_, err = SyncSkus(ctx, nil, []int{model.VendorIDJD}, []string{list1[0].VendorOrgCode}, nil, []int{v.RealSkuID}, true)
 										}
 									}
 								}
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index 6377de869..50aa680a2 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -139,6 +139,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 	globals.SugarLogger.Debugf("SyncSkus vendorIDs:%v, appOrgCodes:%v, nameIDs:%v, skuIDs:%v", vendorIDs, appOrgCodes, nameIDs, skuIDs)
 	db := dao.GetDB()
 	skuList, err := dao.GetSkusWithVendor(db, vendorIDs, appOrgCodes, nameIDs, skuIDs, true)
+	fmt.Println("1111111111111111111111", utils.Format4Output(skuList, false))
 	if err == nil && len(skuList) > 0 {
 		// todo 按vendorID orgCode合并操作
 		task := tasksch.NewParallelTask(fmt.Sprintf("同步商品:%v,%v", nameIDs, skuIDs), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,