- 处理删除SKUNAME或SKU后同步至美团外卖

2019-05-20 16:27:32 +08:00
parent 2b46e8c561
commit d3de08e029
3 changed files with 115 additions and 58 deletions
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -13,6 +13,9 @@ var (
 		model.VendorIDWSC:  "img_weimob",
 		model.VendorIDEBAI: "img_ebai",
 	}
+	descImgFieldMap = map[int]string{
+		model.VendorIDEBAI: "desc_img_ebai",
+	}
 )

 type SkuStoreCatInfo struct {
@@ -144,17 +147,17 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 	sql := `
 	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status, %s vendor_name_id,
 	t2.*,
-	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.%s img, t3.upc, t3.desc_img,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, IF(t3.%s <> '', t3.%s, t3.img) img, t3.upc, t3.%s desc_img,
 	t4.%s_category_id vendor_vendor_cat_id, t4.%s_price_percentage cat_price_percentage,
 	t5.%s_sync_status cat_sync_status, t5.%s_id vendor_cat_id,
 	t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id
 	FROM store_sku_bind t1
 	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 = ?
-	JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
-	JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ?
+	LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
+	LEFT JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ?
 	LEFT JOIN store_sku_category_map t5sku ON t2.category_id = t5sku.category_id AND t5sku.store_id = t1.store_id AND t5sku.deleted_at = ?
-	WHERE t1.store_id = ? AND t1.%s_sync_status <> 0
+	WHERE t1.store_id = ? AND (t1.%s_sync_status <> 0 OR (%s.%s_id <> 0 AND t3.id IS NULL))
 	`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
@@ -171,8 +174,8 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, vendorSkuNameField, GetImgFieldName(vendorID),
-		fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
+	sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, vendorSkuNameField, GetImgFieldName(vendorID), GetImgFieldName(vendorID), GetDescImgFieldName(vendorID),
+		fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, tableName, fieldPrefix)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
@@ -193,7 +196,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	sql := `
 	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, t2.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status,
 	t2.*,
-	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.%s img,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, IF(t3.%s <> '', t3.%s, t3.img) img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	t4.%s_sync_status cat_sync_status, t4.%s_id vendor_cat_id,
 	t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id
@@ -214,7 +217,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 		model.SkuStatusNormal,
 	}
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql = fmt.Sprintf(sql, fieldPrefix, fieldPrefix, GetImgFieldName(vendorID), fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
+	sql = fmt.Sprintf(sql, fieldPrefix, fieldPrefix, GetImgFieldName(vendorID), GetImgFieldName(vendorID), fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
 	// globals.SugarLogger.Debug(sql)
 	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
@@ -227,20 +230,27 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 	globals.SugarLogger.Debugf("SetStoreSkuSyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID)

 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql := fmt.Sprintf(`
+	sql := `
 	UPDATE store_sku_bind t1
 	SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0)
-	`, fieldPrefix, fieldPrefix)
+	`
+	fmtParams := []interface{}{
+		fieldPrefix,
+		fieldPrefix,
+	}
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
 		syncStatus,
 	}
 	if (syncStatus & model.SyncFlagNewMask) != 0 {
-		sql += fmt.Sprintf(`,
+		sql += `,
 		t1.%s_id = 0
-		`, fieldPrefix)
+		`
+		fmtParams = append(fmtParams, fieldPrefix)
 	}
-	sql += " WHERE 1 = 1"
+	sql += " WHERE (t1.deleted_at = ? OR t1.%s_sync_status <> 0)"
+	fmtParams = append(fmtParams, fieldPrefix)
+	sqlParams = append(sqlParams, utils.DefaultTimeValue)
 	if len(storeIDs) > 0 {
 		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
@@ -249,6 +259,7 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
+	sql = fmt.Sprintf(sql, fmtParams...)
 	return ExecuteSQL(db, sql, sqlParams...)
 }

@@ -256,23 +267,36 @@ func SetStoreCategorySyncStatus(db *DaoDB, vendorID int, storeIDs []int, catIDs
 	globals.SugarLogger.Debugf("SetStoreCategorySyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID)

 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql := fmt.Sprintf(`
-	UPDATE store_sku_category_map
-	SET %s_sync_status = IF(deleted_at = ?, %s_sync_status | ?, 0)
-	`, fieldPrefix, fieldPrefix)
+	sql := `
+	UPDATE store_sku_category_map t1
+	SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0)
+	`
+	fmtParams := []interface{}{
+		fieldPrefix,
+		fieldPrefix,
+	}
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
 		syncStatus,
 	}
-	sql += " WHERE 1 = 1"
+	if (syncStatus & model.SyncFlagNewMask) != 0 {
+		sql += `,
+		t1.%s_id = 0
+		`
+		fmtParams = append(fmtParams, fieldPrefix)
+	}
+	sql += " WHERE (t1.deleted_at = ? OR t1.%s_sync_status <> 0)"
+	fmtParams = append(fmtParams, fieldPrefix)
+	sqlParams = append(sqlParams, utils.DefaultTimeValue)
 	if len(storeIDs) > 0 {
-		sql += " AND store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
 	}
 	if len(catIDs) > 0 {
-		sql += " AND category_id IN (" + GenQuestionMarks(len(catIDs)) + ")"
+		sql += " AND t1.category_id IN (" + GenQuestionMarks(len(catIDs)) + ")"
 		sqlParams = append(sqlParams, catIDs)
 	}
+	sql = fmt.Sprintf(sql, fmtParams...)
 	return ExecuteSQL(db, sql, sqlParams...)
 }

@@ -283,3 +307,11 @@ func GetImgFieldName(vendorID int) (fieldName string) {
 	}
 	return fieldName
 }
+
+func GetDescImgFieldName(vendorID int) (fieldName string) {
+	fieldName = descImgFieldMap[vendorID]
+	if fieldName == "" {
+		fieldName = "desc_img"
+	}
+	return fieldName
+}
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -98,7 +98,7 @@ func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs [
 	LEFT JOIN sku_vendor_category cat1 ON t4.ebai_category_id = cat1.vendor_category_id AND cat1.vendor_id = ?
 	LEFT JOIN sku_vendor_category cat2 ON cat1.parent_id = cat2.vendor_category_id AND cat1.vendor_id = ?
 	JOIN store_map t8 ON t8.store_id = t1.store_id AND t8.vendor_id = ? AND t8.deleted_at = ?
-	WHERE t1.store_id = ? AND (t1.ebai_sync_status <> 0 OR (t1.deleted_at = ? AND t3.id IS NULL))
+	WHERE t1.store_id = ? AND (t1.ebai_sync_status <> 0 OR (t1.ebai_id <> 0 AND t3.id IS NULL))
 	`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
@@ -112,7 +112,6 @@ func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs [
 		model.VendorIDEBAI,
 		utils.DefaultTimeValue,
 		storeID,
-		utils.DefaultTimeValue,
 	}
 	if len(skuIDs) > 0 {
 		sql += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
@@ -261,10 +260,8 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 										storeSku.DeletedAt = time.Now()
 										updateFields = append(updateFields, model.FieldDeletedAt)
 									}
-									if !jxutils.IsFakeID(storeSku.EbaiID) {
-										storeSku.EbaiID = 0
-										updateFields = append(updateFields, model.FieldEbaiID)
-									}
+									storeSku.EbaiID = 0
+									updateFields = append(updateFields, model.FieldEbaiID)
 								}
 							} else {
 								if storeSku.Img != "" {
--- a/business/partner/purchase/mtwm/store_sku.go
+++ b/business/partner/purchase/mtwm/store_sku.go
@@ -3,6 +3,7 @@ package mtwm
 import (
 	"errors"
 	"fmt"
+	"time"

 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -255,9 +256,17 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 			updateFields := []string{model.FieldMtwmSyncStatus}
 			storeSkuBind := &model.StoreSkuBind{}
 			storeSkuBind.ID = skuItem.BindID
-			if skuItem.ID == 0 || skuItem.SkuSyncStatus&model.SyncFlagDeletedMask != 0 {
-				if skuItem.SkuSyncStatus&model.SyncFlagNewMask == 0 && skuItem.VendorSkuID != "" {
-					err = api.MtwmAPI.RetailDelete(vendorStoreID, skuItem.VendorSkuID)
+			if skuItem.NameID == 0 || skuItem.SkuSyncStatus&model.SyncFlagDeletedMask != 0 {
+				if skuItem.SkuSyncStatus&model.SyncFlagNewMask == 0 && !isVendorSkuIDEmpty(skuItem.VendorSkuID) {
+					err = ignoreNoAppFoodErr(api.MtwmAPI.RetailDelete(vendorStoreID, skuItem.VendorSkuID))
+				}
+				if err == nil {
+					storeSkuBind.DeletedAt = time.Now()
+					updateFields = append(updateFields, model.FieldDeletedAt)
+					if !isVendorSkuIDEmpty(skuItem.VendorSkuID) {
+						storeSkuBind.MtwmID = 0
+						updateFields = append(updateFields, model.FieldMtwmID)
+					}
 				}
 			} else if skuItem.SkuSyncStatus&(model.SyncFlagStoreSkuModifiedMask|model.SyncFlagNewMask) != 0 {
 				foodData := make(map[string]interface{})
@@ -271,36 +280,40 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 				foodData["skus"] = skus
 				if skuItem.SkuSyncStatus&(model.SyncFlagModifiedMask|model.SyncFlagNewMask|model.SyncFlagPriceMask) != 0 {
 					globals.SugarLogger.Debugf("mtwm SyncStoreSkus3 skuID:%d, SkuSyncStatus:%d", skuItem.ID, skuItem.SkuSyncStatus)
-					foodData["name"] = jxutils.ComposeSkuName(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 30)
-					foodData["description"] = skuItem.Comment
-					foodData["price"] = jxutils.IntPrice2Standard(int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), int(storeDetail.PricePercentage), skuItem.CatPricePercentage)))
-					foodData["min_order_count"] = 1
-					foodData["unit"] = skuItem.Unit
-					foodData["box_num"] = 0
-					foodData["box_price"] = 0.0
-					foodData["category_name"] = skuItem.VendorCatID
-					foodData["is_sold_out"] = skuStatusJX2Mtwm(jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus))
-					foodData["picture"] = skuItem.Img
-					if skuItem.DescImg != "" {
-						foodData["picture_contents"] = skuItem.DescImg
-					}
-					foodData["sequence"] = skuItem.Seq
-					if skuItem.VendorVendorCatID != 0 {
-						foodData["tag_id"] = utils.Int64ToStr(skuItem.VendorVendorCatID)
+					if skuItem.Img == "" {
+						err = fmt.Errorf("SKUNAME%d:%s没有图片，同步失败", skuItem.NameID, skuItem.Name)
 					} else {
-						// foodData["tag_id"] = utils.Int64ToStr(defVendorCatID)
-					}
-					skus[0]["spec"] = jxutils.ComposeSkuSpec(skuItem.SpecQuality, skuItem.SpecUnit)
-					skus[0]["price"] = foodData["price"]
-					skus[0]["stock"] = "*"
-					skus[0]["upc"] = skuItem.Upc
-					if foodData["tag_id"] != nil {
-						skus[0]["weight"] = skuItem.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用
-					}
-					if globals.EnableMtwmStoreWrite {
-						if err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList); err == nil {
-							storeSkuBind.MtwmID = int64(skuItem.ID)
-							updateFields = append(updateFields, model.FieldMtwmID)
+						foodData["name"] = jxutils.ComposeSkuName(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 30)
+						foodData["description"] = skuItem.Comment
+						foodData["price"] = jxutils.IntPrice2Standard(int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), int(storeDetail.PricePercentage), skuItem.CatPricePercentage)))
+						foodData["min_order_count"] = 1
+						foodData["unit"] = skuItem.Unit
+						foodData["box_num"] = 0
+						foodData["box_price"] = 0.0
+						foodData["category_name"] = skuItem.VendorCatID
+						foodData["is_sold_out"] = skuStatusJX2Mtwm(jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus))
+						foodData["picture"] = skuItem.Img
+						if skuItem.DescImg != "" {
+							foodData["picture_contents"] = skuItem.DescImg
+						}
+						foodData["sequence"] = skuItem.Seq
+						if skuItem.VendorVendorCatID != 0 {
+							foodData["tag_id"] = utils.Int64ToStr(skuItem.VendorVendorCatID)
+						} else {
+							// foodData["tag_id"] = utils.Int64ToStr(defVendorCatID)
+						}
+						skus[0]["spec"] = jxutils.ComposeSkuSpec(skuItem.SpecQuality, skuItem.SpecUnit)
+						skus[0]["price"] = foodData["price"]
+						skus[0]["stock"] = "*"
+						skus[0]["upc"] = skuItem.Upc
+						if foodData["tag_id"] != nil {
+							skus[0]["weight"] = skuItem.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用
+						}
+						if globals.EnableMtwmStoreWrite {
+							if err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList); err == nil {
+								storeSkuBind.MtwmID = int64(skuItem.ID)
+								updateFields = append(updateFields, model.FieldMtwmID)
+							}
 						}
 					}
 				} else {
@@ -501,3 +514,18 @@ func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTa
 func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) {
 	return storeSkuList, err
 }
+
+func isVendorSkuIDEmpty(vendorSkuID string) bool {
+	return vendorSkuID == "" || vendorSkuID == "0"
+}
+
+func ignoreNoAppFoodErr(err error) error {
+	if err != nil {
+		if codeErr, ok := err.(*utils.ErrorWithCode); ok {
+			if codeErr.IntCode() == mtwmapi.ErrCodeNoAppFood {
+				err = nil
+			}
+		}
+	}
+	return err
+}