From 246d938ae09e70d6a984ae63a245552e198bfeeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 11 Feb 2020 14:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E9=B2=9C=E8=BE=BE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go       | 2 +-
 business/model/dao/store_sku.go              | 6 +++++-
 business/model/store.go                      | 4 ++++
 business/partner/purchase/ebai/store_sku2.go | 4 +---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 6e500557a..926f6a20b 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -420,7 +420,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 				}
 			} else {
 				if sku.MergedStatus == model.SkuStatusNormal {
-					if dao.IsVendorThingIDEmpty(sku.VendorCatID) {
+					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) {
 						globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
 					} else {
 						createList = append(createList, sku)
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index a92cb0fca..03a674d7c 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -66,6 +66,7 @@ type StoreSkuSyncInfo struct {
 	ExdSkuID   string `orm:"column(exd_sku_id)"`
 	ExdSkuName string
 	ExdUpc     int
+	StoreName  string
 
 	// sku_name
 	Prefix        string
@@ -388,7 +389,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	t13.%s desc_img,
-	t4.%s_category_id vendor_vendor_cat_id`
+	t4.%s_category_id vendor_vendor_cat_id,
+	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
@@ -413,6 +415,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql += `
 	FROM store_sku_bind t1
 	JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_at = ?
+	LEFT JOIN store ts ON ts.id = t1.store_id AND ts.delete_at = ?
 	LEFT JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?/* AND t2.status = ?*/
 	LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?/* AND t3.status = ?*/
 	LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
@@ -425,6 +428,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		utils.DefaultTimeValue, // model.SkuStatusNormal,
 		utils.DefaultTimeValue, // model.SkuStatusNormal,
 		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
 	}
 	if globals.IsStoreSkuAct {
 		sql += `
diff --git a/business/model/store.go b/business/model/store.go
index 1160a7d6f..b0c82a868 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -55,6 +55,10 @@ const (
 	AutoReplyDisabled    = 2 // 禁止自动回复
 )
 
+const (
+	ExdStoreName = "饿鲜达"
+)
+
 var (
 	StoreStatusName = map[int]string{
 		StoreStatusDisabled: "禁用",
diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go
index cc8be4b3f..ffe7f271d 100644
--- a/business/partner/purchase/ebai/store_sku2.go
+++ b/business/partner/purchase/ebai/store_sku2.go
@@ -20,7 +20,6 @@ import (
 
 const (
 	defVendorCatID = 201222934 // 其他蔬菜
-	exdStoreName   = "饿鲜达"
 )
 
 var (
@@ -148,8 +147,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 		isExd       bool = false
 		customSkuID int64
 	)
-	store, _ := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI)
-	if strings.Contains(store.Name, exdStoreName) {
+	if strings.Contains(storeSku.StoreName, model.ExdStoreName) {
 		isExd = true
 		customSkuID = utils.Str2Int64(storeSku.ExdSkuID)
 	} else {