From 84184209287e4446ce9c7e82e975cb86ce024442 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:32:59 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store_sku.go | 61 ++++++++++++++++---------------
 business/jxstore/cms/sync2.go     |  1 -
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 297d76b20..6281e9351 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1239,37 +1239,40 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									}
 									//下面这段很难受
 									{
-										//如果是京东关注，要去建商品
-										list1, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{storeID}, nil, model.StoreStatusAll, 1, "", "", "")
-										//表示这个门店绑定了京东
-										if len(list1) > 0 {
-											//thingmap里肯定存在，再判断有没有同步上去
-											thingMaps, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, []int{v.RealSkuID}, []string{list1[0].VendorOrgCode})
-											if len(thingMaps) > 0 {
-												//如果平台ID为空（未创建到京东）
-												if thingMaps[0].VendorThingID == "" {
-													//并且同步标志还没有带待创建（因为addskuname现在建到thingmap上不会带待创建标志了）
-													if !model.IsSyncStatusNew(thingMaps[0].SyncStatus) {
-														isSyncSkus = true
-														appCodeList = append(appCodeList, list1[0].VendorOrgCode)
-														OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
-															&MultiStoreVendorInfo{
-																VendorID: model.VendorIDJD,
-																OrgCode:  list1[0].VendorOrgCode,
-															},
-														}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
+										//可售了的才整
+										if skuBind.Status == model.StoreSkuBindStatusNormal {
+											//如果是京东关注，要去建商品
+											list1, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{storeID}, nil, model.StoreStatusAll, 1, "", "", "")
+											//表示这个门店绑定了京东
+											if len(list1) > 0 {
+												//thingmap里肯定存在，再判断有没有同步上去
+												thingMaps, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, []int{v.RealSkuID}, []string{list1[0].VendorOrgCode})
+												if len(thingMaps) > 0 {
+													//如果平台ID为空（未创建到京东）
+													if thingMaps[0].VendorThingID == "" {
+														//并且同步标志还没有带待创建（因为addskuname现在建到thingmap上不会带待创建标志了）
+														if !model.IsSyncStatusNew(thingMaps[0].SyncStatus) {
+															isSyncSkus = true
+															appCodeList = append(appCodeList, list1[0].VendorOrgCode)
+															OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
+																&MultiStoreVendorInfo{
+																	VendorID: model.VendorIDJD,
+																	OrgCode:  list1[0].VendorOrgCode,
+																},
+															}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
+														}
 													}
+												} else {
+													//万一不存在
+													isSyncSkus = true
+													appCodeList = append(appCodeList, list1[0].VendorOrgCode)
+													OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
+														&MultiStoreVendorInfo{
+															VendorID: model.VendorIDJD,
+															OrgCode:  list1[0].VendorOrgCode,
+														},
+													}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
 												}
-											} else {
-												//万一不存在
-												isSyncSkus = true
-												appCodeList = append(appCodeList, list1[0].VendorOrgCode)
-												OnCreateThing(ctx, db, []*MultiStoreVendorInfo{
-													&MultiStoreVendorInfo{
-														VendorID: model.VendorIDJD,
-														OrgCode:  list1[0].VendorOrgCode,
-													},
-												}, int64(v.RealSkuID), model.ThingTypeSku, model.SyncFlagNewMask)
 											}
 										}
 									}
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index 50aa680a2..6377de869 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -139,7 +139,6 @@ 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,