订单转移，自动下架等尝试

business/jxcallback/orderman/order.go

@@ -1219,6 +1219,9 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	}
 	//重新构建order的数据
 	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	if err != nil || len(storeMaps) == 0 {
+		return "", fmt.Errorf("该门店未绑定京狗平台，请先绑定后再转移！门店：[%v]", storeID)
+	}
 	stores, err := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
 	if len(storeMaps) > 0 && len(stores) > 0 {
 		order.StoreID = storeID

business/jxstore/cms/sync.go

@@ -1115,7 +1115,7 @@ func syncJdsStoreStock(ctx *jxcontext.Context, db *dao.DaoDB, storeSkus []*model
 		}
 		storeSku2, _ := dao.GetStoresSkusInfo(db, []int{storeMap.StoreID}, []int{storeSku.SkuID})
 		if storeSku.JdsID != 0 && len(storeSku2) > 0 {
-			if storeSku.Status != storeSku2[0].Status {
+			if storeSku.Status != storeSku2[0].Status && storeMap.VendorStoreID != "" {
 				err = api.JdShopAPI.UpdateSkuSiteStock(storeSku.JdsID, stock, utils.Str2Int(storeMap.VendorStoreID))
 			}
 		}

business/jxstore/cms/sync_store_sku.go

@@ -283,7 +283,6 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
 			skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0)
 			if skuItem.ImgWatermark != "" {
 				downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
-				fmt.Println("testdo", downLoad)
 				skuItem.ImgMix = jxutils.MixWatermarkImg(downLoad, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
 			}
 		}

business/jxstore/misc/misc.go

@@ -362,7 +362,8 @@ func syncStoreSku() {
 				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, []int{1, 3}))
 
 				// errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, partner.GetSingleStoreVendorIDs()))
-				_, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3}, nil, false, true, cms.AmendPruneAll, false)
+				//TODO 06-22 暂时不做这个看看
+				// _, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3}, nil, false, true, cms.AmendPruneAll, false)
 
 				// _, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, partner.GetSingleStoreVendorIDs(), nil, false, true, cms.AmendPruneAll, false)
 				errList.AddErr(err)