!删除IsUseThingMap

2020-01-17 16:09:52 +08:00
parent 0fffdfdd76
commit 3e89a07a96
10 changed files with 45 additions and 301 deletions
--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -77,13 +77,9 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 	pageSize = jxutils.FormalizePageSize(pageSize)

 	leftOrEmpty := ""
-	jdVendorIDField := "t4.jd_id"
 	if len(vendorIDs) == 1 && (vendorIDs[0] == -1 || vendorIDs[0] == model.VendorIDJX) {
 		leftOrEmpty = "LEFT"
 	}
-	if globals.IsUseThingMap {
-		jdVendorIDField = "t4m.vendor_thing_id"
-	}
 	sql := fmt.Sprintf(`
 	SELECT SQL_CALC_FOUND_ROWS
 	t1.*,
@@ -91,7 +87,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 	t3.vendor_store_id,
 	CASE t2.vendor_id
 		WHEN 0 THEN
-			%s
+			t4m.vendor_thing_id
 		WHEN 1 THEN
 			t5.mtwm_id
 		WHEN 3 THEN
@@ -103,7 +99,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 	t6.name store_name,
 	t7.name sku_name_name, t7.unit, t7.prefix, t7.ex_prefix, t7.ex_prefix_begin, t7.ex_prefix_end
 	FROM act_store_sku t1
-	%s JOIN act_store_sku_map t2 ON t2.act_id = ? AND t2.bind_id = t1.id AND t2.deleted_at = ?`, jdVendorIDField, leftOrEmpty)
+	%s JOIN act_store_sku_map t2 ON t2.act_id = ? AND t2.bind_id = t1.id AND t2.deleted_at = ?`, leftOrEmpty)
 	sqlParams := []interface{}{
 		actID,
 		utils.DefaultTimeValue,
@@ -115,20 +111,16 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 	}
 	sql += `
 	LEFT JOIN store_map t3 ON t3.store_id = t1.store_id AND t3.vendor_id = t2.vendor_id AND t3.deleted_at = ?
-	JOIN sku t4 ON t4.id = t1.sku_id`
-	sqlParams = append(sqlParams, utils.DefaultTimeValue)
-	if globals.IsUseThingMap {
-		sql += `
-		LEFT JOIN thing_map t4m ON t4m.thing_id = t4.id AND t4m.thing_type = ? AND t4m.vendor_id = t2.vendor_id AND t4m.vendor_org_code = t3.vendor_org_code AND t4m.deleted_at = ?`
-		sqlParams = append(sqlParams, model.ThingTypeSku, utils.DefaultTimeValue)
-	}
-	sql += `
+	JOIN sku t4 ON t4.id = t1.sku_id
+	LEFT JOIN thing_map t4m ON t4m.vendor_id = ? AND t4m.thing_id = t4.id AND t4m.thing_type = ? AND t4m.vendor_id = t2.vendor_id AND t4m.vendor_org_code = t3.vendor_org_code AND t4m.deleted_at = ?
 	LEFT JOIN store_sku_bind t5 ON t5.sku_id = t1.sku_id AND t5.store_id = t1.store_id AND t5.deleted_at = ?
 	LEFT JOIN store t6 ON t6.id = t1.store_id
 	JOIN sku_name t7 ON t7.id = t4.name_id
 	WHERE t1.act_id = ?
 	`
 	sqlParams = append(sqlParams,
+		utils.DefaultTimeValue,
+		model.VendorIDJD, model.ThingTypeSku, utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
 		actID,
 	)
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -335,13 +335,6 @@ func GetDirtyStoreCategories(db *DaoDB, vendorID, storeID int, level int, skuIDs
 // 以store_sku_bind为基础来做同步，正常情况下使用
 // 单多门店模式厂商通用
 func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
-	if !globals.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")
 	}
@@ -448,99 +441,6 @@ func newGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty
 	return skus, err
 }

-func oldGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
-	if vendorID < 0 {
-		panic("vendorID<0")
-	}
-	isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1
-	tableName := "t1"
-	if !isSingleStorePF {
-		tableName = "t2"
-	}
-	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql := `
-	SELECT t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status,
-	%s.%s_id 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,t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end,
-	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{}{
-		tableName, fieldPrefix, 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 += `,
-		t4.%s_id vendor_cat_id,
-		t5sku.%s_id sku_vendor_cat_id`
-		fmtParams = append(fmtParams, fieldPrefix, fieldPrefix)
-	}
-	sql += `
-	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 = ?
-	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{}{
-		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`
-	}
-	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_id <> 0 AND t3.id IS NULL))"
-		fmtParams = append(fmtParams, fieldPrefix, tableName, fieldPrefix)
-	} 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 GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*StoreSkuSyncInfo, err error) {
 	return GetStoreSkus2(db, vendorID, storeID, skuIDs, true)
 }
@@ -548,13 +448,6 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 // 以sku为基础来做全同步，
 // 多门店模式厂商适用
 func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
-	if !globals.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)

 	// 对于多门店平台，商品库删除后，不需要操作门店商品，所以sku_name用JOIN, sku与sku_name也可以直接排除下架的
@@ -611,57 +504,6 @@ func newGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSync
 	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,
-	t13.%s desc_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
-	FROM sku t2
-	LEFT JOIN store_sku_bind t1 ON t1.sku_id = t2.id AND t1.store_id = ? AND t1.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 sku_category t5sku ON t2.category_id = t5sku.id
-	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 t2.%s_id <> 0
-	ORDER BY t1.price DESC`
-	sqlParams := []interface{}{
-		storeID,
-		utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
-		model.SkuStatusNormal,
-		utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
-		model.SkuStatusNormal,
-	}
-	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql = fmt.Sprintf(sql, fieldPrefix,
-		fieldPrefix,
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID),
-		fieldPrefix,
-		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 {
-		return nil, err
-	}
-	return skus, err
-}
-
 func GetStoreSkuPriceAndWeight(db *DaoDB, vendorStoreID string, vendorID int, vendorSkuIDs []string) (l []*StoreSkuPriceAndWeight, err error) {
 	var vendorSkuIDField, sqlThingMap string
 	var thingMapParams []interface{}
--- a/business/model/dao/thing_map.go
+++ b/business/model/dao/thing_map.go
@@ -1,8 +1,6 @@
 package dao

 import (
-	"fmt"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -65,56 +63,15 @@ func SetThingMapSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string,
 }

 func SetSkuNameSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, nameIDs []int, syncStatus int8) (num int64, err error) {
-	if globals.IsUseThingMap {
-		skuIDs, err2 := GetSkuIDByNames(db, nameIDs)
-		if err = err2; err == nil {
-			num, err = SetThingMapSyncStatus(db, vendorIDs, vendorOrgCodes, model.ThingTypeSku, skuIDs, syncStatus)
-		}
-	} else {
-		sql := `
-		UPDATE sku t1
-		SET t1.jd_sync_status = t1.jd_sync_status | ?
-		WHERE t1.deleted_at = ?
-		`
-		sqlParams := []interface{}{
-			syncStatus,
-			utils.DefaultTimeValue,
-		}
-		if len(nameIDs) > 0 {
-			sql += " AND t1.name_id IN(" + GenQuestionMarks(len(nameIDs)) + ")"
-			sqlParams = append(sqlParams, nameIDs)
-		}
-		num, err = ExecuteSQL(db, sql, sqlParams...)
+	skuIDs, err2 := GetSkuIDByNames(db, nameIDs)
+	if err = err2; err == nil {
+		num, err = SetThingMapSyncStatus(db, vendorIDs, vendorOrgCodes, model.ThingTypeSku, skuIDs, syncStatus)
 	}
 	return num, err
 }

 func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) {
 	globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID)
-
-	if globals.IsUseThingMap {
-		num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
-	} else {
-		fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-		sql := fmt.Sprintf(`
-	UPDATE sku t1
-	SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0)
-	`, fieldPrefix, fieldPrefix)
-		sqlParams := []interface{}{
-			utils.DefaultTimeValue,
-			syncStatus,
-		}
-		if (syncStatus & model.SyncFlagNewMask) != 0 {
-			sql += fmt.Sprintf(`,
-		t1.%s_id = 0
-		`, fieldPrefix)
-		}
-		sql += " WHERE 1 = 1"
-		if len(skuIDs) > 0 {
-			sql += " AND t1.id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
-			sqlParams = append(sqlParams, skuIDs)
-		}
-		num, err = ExecuteSQL(db, sql, sqlParams...)
-	}
+	num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
 	return num, err
 }