准备切换thing_map,IsUseThingMap

2019-12-10 09:43:08 +08:00
parent 46d3d7d8f0
commit 87e8aec310
3 changed files with 204 additions and 2 deletions
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -129,6 +129,13 @@ func (v *VendorSync) syncCategories(ctx *jxcontext.Context, parentTask tasksch.I
 }

 func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
+	if !model.IsUseThingMap {
+		return v.oldSyncCategory(ctx, db, categoryID, isAsync, userName)
+	}
+	return SyncCategories(ctx, nil, nil, nil, []int{categoryID}, isAsync)
+}
+
+func (v *VendorSync) oldSyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
 	globals.SugarLogger.Debug("SyncCategory")
 	hint, err = v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步分类信息:%d", categoryID), isAsync, false,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
@@ -158,6 +165,13 @@ func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categor
 }

 func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
+	if !model.IsUseThingMap {
+		return v.oldSyncReorderCategories(ctx, db, categoryID, isAsync, userName)
+	}
+	return SyncReorderCategories(ctx, -1, isAsync)
+}
+
+func (v *VendorSync) oldSyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
 	hint, err = v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("分类重排序:%d", categoryID), isAsync, false, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 		vendorInfo := batchItemList[0].(*tMultiStoreVendorInfo)
 		multiStoresHandler := v.GetMultiStoreHandler(vendorInfo.VendorID)
@@ -232,6 +246,13 @@ func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuI
 }

 func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) {
+	if !model.IsUseThingMap {
+		return v.oldSyncSkus(ctx, db, nameIDs, skuIDs, isAsync, isContinueWhenError, userName)
+	}
+	return SyncSkus(ctx, nil, nil, nil, nameIDs, skuIDs, isAsync)
+}
+
+func (v *VendorSync) oldSyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) {
 	globals.SugarLogger.Debugf("SyncSku trackInfo:%s, nameIDs:%v, skuIDs:%v, userName:%s", ctx.GetTrackInfo(), nameIDs, skuIDs, userName)
 	isManagedIt := !(len(nameIDs) > 0 && len(nameIDs) <= 2 || len(skuIDs) > 0 && len(skuIDs) < 8)
 	return v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步商品信息, nameIDs:%v, skuIDs:%v", nameIDs, skuIDs), isAsync, isManagedIt,
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -212,6 +212,120 @@ func GetDirtyStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats
 // 以store_sku_bind为基础来做同步，正常情况下使用
 // 单多门店模式厂商通用
 func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
+	if !model.IsUseThingMap {
+		return oldGetStoreSkus2(db, vendorID, storeID, skuIDs, mustDirty)
+	}
+	return newGetStoreSkus2(db, vendorID, storeID, skuIDs, mustDirty)
+}
+
+func newGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
+	if vendorID < 0 {
+		panic("vendorID<0")
+	}
+	isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1
+	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
+	skuVendorIDField := fmt.Sprintf("t1.%s_id", fieldPrefix)
+	if !isSingleStorePF {
+		skuVendorIDField = "t2m.vendor_thing_id"
+	}
+	sql := `
+	SELECT
+	t14.vendor_id, t14.vendor_org_code,
+	t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status,
+	%s vendor_sku_id, t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price,
+	t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end,
+	t2.*,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
+	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`
+	fmtParams := []interface{}{
+		skuVendorIDField, fieldPrefix, fieldPrefix,
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID),
+		fieldPrefix,
+	}
+	if isSingleStorePF {
+		sql += `,
+		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`
+		fmtParams = append(fmtParams, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
+	} else {
+		sql += `,
+		t4m.vendor_thing_id vendor_cat_id,
+		t5skum.vendor_thing_id sku_vendor_cat_id`
+	}
+	sql += `
+	FROM store_sku_bind t1
+	LEFT JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_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 = ?
+	LEFT JOIN data_resource t11 ON t11.main_url = t3.img
+	LEFT JOIN data_resource t12 ON t12.main_url = t3.img2
+	LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img
+	`
+	sqlParams := []interface{}{
+		vendorID, utils.DefaultTimeValue,
+		utils.DefaultTimeValue, model.SkuStatusNormal,
+		utils.DefaultTimeValue, model.SkuStatusNormal,
+		utils.DefaultTimeValue,
+	}
+	if isSingleStorePF {
+		sql += `
+		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 = ?`
+		sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue)
+	} else {
+		sql += `
+		LEFT JOIN sku_category t5sku ON t5sku.id = t2.category_id
+		LEFT JOIN thing_map t2m ON t2m.thing_id = t1.sku_id AND t2m.vendor_org_code = t14.vendor_org_code AND t2m.thing_type = ? AND t2m.vendor_id = ? AND t2m.deleted_at = ?
+		LEFT JOIN thing_map t4m ON t4m.thing_id = t3.category_id AND t4m.vendor_org_code = t14.vendor_org_code AND t4m.thing_type = ? AND t4m.vendor_id = ? AND t4m.deleted_at = ?
+		LEFT JOIN thing_map t5skum ON t5skum.thing_id = t5sku.id AND t5skum.vendor_org_code = t14.vendor_org_code AND t5skum.thing_type = ? AND t5skum.vendor_id = ? AND t5skum.deleted_at = ?
+		`
+		sqlParams = append(sqlParams,
+			model.ThingTypeSku, vendorID, utils.DefaultTimeValue,
+			model.ThingTypeCategory, vendorID, utils.DefaultTimeValue,
+			model.ThingTypeCategory, vendorID, utils.DefaultTimeValue)
+	}
+	sql += " WHERE 1 = 1"
+	if storeID > 0 {
+		sql += " AND t1.store_id = ?"
+		sqlParams = append(sqlParams, storeID)
+	}
+	if mustDirty {
+		sql += " AND (t1.%s_sync_status <> 0 OR (%s <> %s AND t3.id IS NULL))"
+		fmtParams = append(fmtParams, fieldPrefix, skuVendorIDField)
+		if isSingleStorePF {
+			fmtParams = append(fmtParams, "0")
+		} else {
+			fmtParams = append(fmtParams, "''")
+		}
+	} else {
+		sql += " AND t1.deleted_at = ?"
+		sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	// 多门店平台没有成功创建的商品，不直接过滤，让上层同步时报错
+	// if !isSingleStorePF {
+	// 	sql += " AND t2.%s_id <> 0"
+	// 	fmtParams = append(fmtParams, fieldPrefix)
+	// }
+	sql = fmt.Sprintf(sql, fmtParams...)
+	sql += " ORDER BY t1.price"
+	// globals.SugarLogger.Debug(sql)
+	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
+		return nil, err
+	}
+	return skus, err
+}
+
+func oldGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
 	if vendorID < 0 {
 		panic("vendorID<0")
 	}
@@ -311,12 +425,75 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 // 以sku为基础来做全同步，
 // 多门店模式厂商适用
 func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
+	if !model.IsUseThingMap {
+		return oldGetFullStoreSkus(db, vendorID, storeID)
+	}
+	return newGetFullStoreSkus(db, vendorID, storeID)
+}
+
+func newGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
 	globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID)

 	sql := `
-	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, t2.%s_id vendor_sku_id,
+	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status,
 	t1.%s_sync_status sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at,
-	t2.*, t2.id sku_id,
+	t2.*, t2.id sku_id, t2m.vendor_thing_id vendor_sku_id,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
+	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,
+	t4m.sync_status cat_sync_status, t4m.vendor_thing_id vendor_cat_id,
+	t5skum.sync_status sku_cat_sync_status, t5skum.vendor_thing_id sku_vendor_cat_id
+	FROM sku t2
+	LEFT JOIN store_sku_bind t1 ON t1.sku_id = t2.id AND t1.store_id = ? AND t1.deleted_at = ?
+	LEFT JOIN store_map sm ON sm.store_id = t1.store_id AND sm.vendor_id = ? AND sm.deleted_at = ?
+	LEFT JOIN thing_map t2m ON t2m.thing_id = t2.id AND t2m.vendor_org_code = sm.vendor_org_code AND t2m.thing_type = ? AND t2m.vendor_id = ? AND t2m.deleted_at = ?
+	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 = ?
+	LEFT JOIN thing_map t4m ON t4m.thing_id = t3.category_id AND t4m.vendor_org_code = sm.vendor_org_code AND t4m.thing_type = ? AND t4m.vendor_id = ? AND t4m.deleted_at = ?
+	LEFT JOIN sku_category t5sku ON t2.category_id = t5sku.id
+	LEFT JOIN thing_map t5skum ON t5skum.thing_id = t2.category_id AND t5skum.vendor_org_code = sm.vendor_org_code AND t5skum.thing_type = ? AND t5skum.vendor_id = ? AND t5skum.deleted_at = ?
+	LEFT JOIN data_resource t11 ON t11.main_url = t3.img
+	LEFT JOIN data_resource t12 ON t12.main_url = t3.img2
+	LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img
+	WHERE t2.deleted_at = ? AND t2.status = ? AND t2m.vendor_thing_id <> ''
+	ORDER BY t1.price DESC`
+	sqlParams := []interface{}{
+		storeID,
+		utils.DefaultTimeValue,
+		vendorID, utils.DefaultTimeValue,
+		model.ThingTypeSku, vendorID, utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+		model.SkuStatusNormal,
+		utils.DefaultTimeValue,
+		model.ThingTypeCategory, vendorID, utils.DefaultTimeValue,
+		model.ThingTypeCategory, vendorID, utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+		model.SkuStatusNormal,
+	}
+	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
+	sql = fmt.Sprintf(sql,
+		fieldPrefix,
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID),
+		fieldPrefix)
+	// globals.SugarLogger.Debug(sql)
+	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
+	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
+		return nil, err
+	}
+	return skus, err
+}
+
+func oldGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
+	globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID)
+
+	sql := `
+	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status,
+	t1.%s_sync_status sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at,
+	t2.*, t2.id sku_id, t2.%s_id vendor_sku_id,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
--- a/business/model/sync_map.go
+++ b/business/model/sync_map.go
@@ -6,6 +6,10 @@ const (
 	ThingTypeSku      = 3
 )

+const (
+	IsUseThingMap = false
+)
+
 type ThingMap struct {
 	ModelIDCULD