From a8f0a392048d3cfb28f23809d2bfdd88f0d985e5 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 26 May 2021 10:07:15 +0800
Subject: [PATCH] a

---
 business/jxstore/cms/sku.go       | 2 +-
 business/jxstore/cms/store_sku.go | 3 ++-
 business/model/dao/sku.go         | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index d2b4864dd..215cc8de9 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -83,7 +83,7 @@ func GetVendorCategoriesWithMap(ctx *jxcontext.Context, vendorID int) (vendorCat
 	if vendorID != model.VendorIDMTWM {
 		return nil, fmt.Errorf("只支持美团！")
 	}
-	return dao.GetVendorCategoriesWithMap(dao.GetDB(), vendorID)
+	return dao.GetVendorCategoriesWithMap(dao.GetDB(), vendorID, 0)
 }
 
 // parentID 为-1表示所有
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 96971f3a1..f468111bc 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -5693,7 +5693,8 @@ func CopyMtToJd(ctx *jxcontext.Context, mtStoreID, mtOrgCode, jdStoreID, jdOrgCo
 						mtSku := batchItemList[0].(*mtwmapi.AppFood)
 						catMaps, _ := dao.GetMtJdCategoryMap(db, utils.Int2Str(mtSku.TagID), "")
 						if len(catMaps) == 0 {
-							return retVal, fmt.Errorf("该商品美团分类还未映射到京东，美团分类：[%v]。", mtSku.TagID)
+							results, _ := dao.GetVendorCategoriesWithMap(db, model.VendorIDMTWM, mtSku.TagID)
+							return retVal, fmt.Errorf("该商品美团分类还未映射到京东，商品名：[%v]，美团分类：[%v]。", mtSku.Name, results[0].Name)
 						}
 						param := &jdapi.OpSkuParam{
 							TraceID:        ctx.GetTrackInfo(),
diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index 9e7a7c6de..676d511d4 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -605,7 +605,7 @@ type GetVendorCategoriesWithMapResult struct {
 	CatMapID string `orm:"column(cat_map_id)" json:"catMapID"`
 }
 
-func GetVendorCategoriesWithMap(db *DaoDB, vendorID int) (results []*GetVendorCategoriesWithMapResult, err error) {
+func GetVendorCategoriesWithMap(db *DaoDB, vendorID, vendorCategoryID int) (results []*GetVendorCategoriesWithMapResult, err error) {
 	sql := `
 		SELECT a.*, b.jd_id cat_map_id
 		  FROM sku_vendor_category a
@@ -613,6 +613,10 @@ func GetVendorCategoriesWithMap(db *DaoDB, vendorID int) (results []*GetVendorCa
          WHERE vendor_id = ?
 	`
 	sqlParams := []interface{}{vendorID}
+	if vendorCategoryID != 0 {
+		sql += " AND a.vendor_category_id = ?"
+		sqlParams = append(sqlParams, vendorCategoryID)
+	}
 	GetRows(db, &results, sql, sqlParams)
 	return results, err
 }