!删除IsUseThingMap

business/jxstore/cms/sku.go

@@ -381,19 +381,15 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 	}
 	if keyword != "" {
 		keywordLike := "%" + keyword + "%"
-		sql += " AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ?"
+		sql += `
-		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike)
+			AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ?
-		if globals.IsUseThingMap {
+				OR (SELECT COUNT(*) FROM thing_map tm WHERE tm.vendor_thing_id LIKE ? AND tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ?) > 0`
-			sql += " OR (SELECT COUNT(*) FROM thing_map tm WHERE tm.vendor_thing_id LIKE ? AND tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ?) > 0"
+		sqlParams = append(sqlParams,
-			sqlParams = append(sqlParams, keywordLike, model.ThingTypeSku, utils.DefaultTimeValue)
+			keywordLike, keywordLike, keywordLike, keywordLike,
-		}
+			keywordLike, model.ThingTypeSku, utils.DefaultTimeValue)
 		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
 			sql += " OR t1.id = ? OR t2.id = ? OR t1.category_id = ?"
 			sqlParams = append(sqlParams, keywordInt64, keywordInt64, keywordInt64)
-			if !globals.IsUseThingMap {
-				sql += " OR t2.jd_id = ?"
-				sqlParams = append(sqlParams, keywordInt64)
-			}
 		}
 		sql += ")"
 	}
@@ -449,13 +445,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 			return nil, err
 		}
 		if len(vendorSkuIDs) > 0 {
-			if globals.IsUseThingMap {
+			sql += " AND (SELECT COUNT(*) FROM thing_map tm WHERE tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")) > 0"
-				sql += " AND (SELECT COUNT(*) FROM thing_map tm WHERE tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")) > 0"
+			sqlParams = append(sqlParams, utils.DefaultTimeValue, vendorSkuIDs)
-				sqlParams = append(sqlParams, utils.DefaultTimeValue, vendorSkuIDs)
-			} else {
-				sql += " AND t2.jd_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
-				sqlParams = append(sqlParams, vendorSkuIDs)
-			}
 		}
 	}
 	if params["name"] != nil {

business/jxstore/cms/store_sku.go

@@ -209,17 +209,15 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 	FROM sku_name t1
 	JOIN sku t2 FORCE INDEX(PRIMARY) ON t1.id = t2.name_id AND t2.deleted_at = ?/* AND t2.status = ?*/
 	JOIN store t3 ON t3.deleted_at = ?
+	LEFT JOIN store_map sm ON sm.store_id = t3.id AND sm.vendor_id = ? AND sm.deleted_at = ?
+	LEFT JOIN thing_map t2m ON t2m.thing_type = ? AND t2m.thing_id = t2.id AND t2m.vendor_id = sm.vendor_id AND t2m.vendor_org_code = sm.vendor_org_code AND t2m.deleted_at = ?
 	`
 	sqlParams = []interface{}{
 		utils.DefaultTimeValue,
 		// model.SkuStatusNormal,
 		utils.DefaultTimeValue,
-	}
+		model.VendorIDJD, utils.DefaultTimeValue, // TODO 这里直接用JD有问题
-	if globals.IsUseThingMap {
+		model.ThingTypeSku, utils.DefaultTimeValue,
-		sql += `
-		LEFT JOIN store_map sm ON sm.store_id = t3.id AND sm.vendor_id = ? AND sm.deleted_at = ?
-		LEFT JOIN thing_map t2m ON t2m.thing_type = ? AND t2m.thing_id = t2.id AND t2m.vendor_id = sm.vendor_id AND t2m.vendor_org_code = sm.vendor_org_code AND t2m.deleted_at = ?`
-		sqlParams = append(sqlParams, model.VendorIDJD, utils.DefaultTimeValue, model.ThingTypeSku, utils.DefaultTimeValue)
 	}
 	if isAct {
 		sql += `
@@ -289,15 +287,13 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike)
 
 		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
-			sql += " OR t1.id = ? OR t2.id = ?"
+			sql += `
-			sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+			OR t1.id = ? OR t2.id = ?
-			if !globals.IsUseThingMap {
+			OR (SELECT COUNT(*) FROM thing_map tm WHERE tm.vendor_org_code = sm.vendor_org_code AND tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id = ?) > 0
-				sql += " OR t2.jd_id = ?"
+			`
-				sqlParams = append(sqlParams, keywordInt64)
+			sqlParams = append(sqlParams,
-			} else {
+				keywordInt64, keywordInt64,
-				sql += " OR (SELECT COUNT(*) FROM thing_map tm WHERE tm.vendor_org_code = sm.vendor_org_code AND tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id = ?) > 0"
+				model.ThingTypeSku, utils.DefaultTimeValue, keywordInt64)
-				sqlParams = append(sqlParams, model.ThingTypeSku, utils.DefaultTimeValue, keywordInt64)
-			}
 			if isFocus {
 				sql += " OR t4.ebai_id = ? OR t4.mtwm_id = ?"
 				sqlParams = append(sqlParams, keywordInt64, keywordInt64)
@@ -384,11 +380,7 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 			}
 			sql += " AND ( 1 = 0"
 			if params["jdSyncStatus"] != nil && realVendorMap[model.VendorIDJD] == 1 {
-				if globals.IsUseThingMap {
+				sql += " OR (t4.jd_sync_status & ? <> 0 AND t1.status = ? AND t2.status = ?)"
-					sql += " OR (t4.jd_sync_status & ? <> 0 AND t1.status = ? AND t2.status = ?)"
-				} else {
-					sql += " OR (t4.jd_sync_status & ? <> 0 AND t2.jd_id <> 0 AND t1.status = ? AND t2.status = ?)"
-				}
 				sqlParams = append(sqlParams, params["jdSyncStatus"], model.SkuStatusNormal, model.SkuStatusNormal)
 			}
 			if params["ebaiSyncStatus"] != nil && realVendorMap[model.VendorIDEBAI] == 1 {
@@ -484,15 +476,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
 		LIMIT ? OFFSET ?`
 		sqlParams = append(sqlParams, sqlParamsPage)
 	}
-	jdVendorIDField := "t2.jd_id"
+
-	if globals.IsUseThingMap {
+	sql = `
-		jdVendorIDField = "t2m.vendor_thing_id"
-	}
-	sql = fmt.Sprintf(`
 	SELECT SQL_CALC_FOUND_ROWS
 	t3.id store_id, t3.name store_name, t3.pay_percentage,
 	t1.*,
-	t2.name_id, t2.id sku_id, t2.spec_quality sku_spec_quality, t2.spec_unit sku_spec_unit, t2.weight, %s sku_jd_id,
+	t2.name_id, t2.id sku_id, t2.spec_quality sku_spec_quality, t2.spec_unit sku_spec_unit, t2.weight, t2m.vendor_thing_id sku_jd_id,
 	t2.comment, t2.category_id sku_category_id, t2.status sku_status,
 	t4.created_at bind_created_at, t4.updated_at bind_updated_at, t4.last_operator bind_last_operator, t4.deleted_at bind_deleted_at,
 	t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at,
@@ -502,7 +491,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
 	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time,
 	t4.status_sale_begin, t4.status_sale_end,
 	t6.mid_unit_price real_mid_unit_price
-	`, jdVendorIDField) + sql
+	` + sql
 	var tmpList []*tGetStoresSkusInfo
 	beginTime := time.Now()
 	if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil {

business/jxstore/cms/sync.go

@@ -169,9 +169,6 @@ func (v *VendorSync) GetSingleStoreHandler(vendorID int) partner.ISingleStoreHan
 // }
 
 func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
-	// if !globals.IsUseThingMap {
-	// 	return v.oldSyncCategory(ctx, db, categoryID, isAsync, userName)
-	// }
 	return SyncCategories(ctx, nil, nil, nil, []int{categoryID}, isAsync)
 }
 
@@ -205,9 +202,6 @@ 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 !globals.IsUseThingMap {
-	// 	return v.oldSyncReorderCategories(ctx, db, categoryID, isAsync, userName)
-	// }
 	return SyncReorderCategories(ctx, categoryID, isAsync)
 }
 
@@ -302,9 +296,6 @@ 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 !globals.IsUseThingMap {
-	// 	return v.oldSyncSkus(ctx, db, nameIDs, skuIDs, isAsync, isContinueWhenError, userName)
-	// }
 	return SyncSkus(ctx, nil, nil, nil, nameIDs, skuIDs, isAsync)
 }
 
@@ -795,9 +786,6 @@ func isSyncError(err error) bool {
 }
 
 func (v *VendorSync) SyncSkuNames(ctx *jxcontext.Context, nameIDs []int, isForce, isAsync, isContinueWhenError bool) (hint string, err error) {
-	if !globals.IsUseThingMap {
-		return v.oldSyncSkuNames(ctx, nameIDs, isForce, isAsync, isContinueWhenError)
-	}
 	return SyncSkus(ctx, nil, nil, nil, nameIDs, nil, isAsync)
 }
 

business/jxstore/cms/sync2.go

@@ -257,9 +257,7 @@ func OnCreateThing(ctx *jxcontext.Context, db *dao.DaoDB, vendorInfoList []*Mult
 		}
 		updateThingMapEntity(db, thingMap)
 	}
-	if globals.IsUseThingMap {
+	err = errList.GetErrListAsOne()
-		err = errList.GetErrListAsOne()
-	}
 	return err
 }
 
@@ -290,9 +288,7 @@ func onUpdateThing(ctx *jxcontext.Context, db *dao.DaoDB, vendorInfoList []*Mult
 			errList.AddErr(err2)
 		}
 	}
-	if globals.IsUseThingMap {
+	err = errList.GetErrListAsOne()
-		err = errList.GetErrListAsOne()
-	}
 	return err
 }
 
@@ -332,9 +328,7 @@ func OnDeleteThing(ctx *jxcontext.Context, db *dao.DaoDB, vendorInfoList []*Mult
 			errList.AddErr(err2)
 		}
 	}
-	if globals.IsUseThingMap {
+	err = errList.GetErrListAsOne()
-		err = errList.GetErrListAsOne()
-	}
 	return err
 }
 

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`
+	JOIN sku t4 ON t4.id = t1.sku_id
-	sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	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 = ?
-	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 += `
 	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,
 	)

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{}

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)
-		skuIDs, err2 := GetSkuIDByNames(db, nameIDs)
+	if err = err2; err == nil {
-		if err = err2; err == nil {
+		num, err = SetThingMapSyncStatus(db, vendorIDs, vendorOrgCodes, model.ThingTypeSku, skuIDs, syncStatus)
-			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...)
 	}
 	return num, err
 }
 
 func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) {
 	globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID)
-
+	num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
-	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...)
-	}
 	return num, err
 }

conf/app.conf

@@ -105,7 +105,6 @@ zhongwuAppSecret = "29435497822f52f3cf659c65da548a79"
 getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
 storeName = "京西菜市"
 
-useThingMap = true
 addEvent = true
 
 [dev]

controllers/cms_sync.go

@@ -9,7 +9,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego"
 )
 
@@ -216,19 +215,15 @@ func (c *SyncController) SyncSkuNames() {
 	c.callSyncSkuNames(func(params *tSyncSyncSkuNamesParams) (retVal interface{}, errCode string, err error) {
 		var nameIDs []int
 		if err = jxutils.Strings2Objs(params.NameIDs, &nameIDs); err == nil {
-			if globals.IsUseThingMap {
+			var vendorIDs []int
-				var vendorIDs []int
+			if params.MapData["vendorID"] != nil {
-				if params.MapData["vendorID"] != nil {
+				vendorIDs = append(vendorIDs, params.VendorID)
-					vendorIDs = append(vendorIDs, params.VendorID)
-				}
-				vendorOrgCodes := jxutils.BatchString2Slice(params.VendorOrgCode)
-				if params.IsForce {
-					dao.SetSkuNameSyncStatus(dao.GetDB(), vendorIDs, vendorOrgCodes, nameIDs, model.SyncFlagModifiedMask)
-				}
-				retVal, err = cms.SyncSkus(params.Ctx, nil, vendorIDs, vendorOrgCodes, nameIDs, nil, params.IsAsync)
-			} else {
-				retVal, err = cms.CurVendorSync.SyncSkuNames(params.Ctx, nameIDs, params.IsForce, params.IsAsync, params.IsContinueWhenError)
 			}
+			vendorOrgCodes := jxutils.BatchString2Slice(params.VendorOrgCode)
+			if params.IsForce {
+				dao.SetSkuNameSyncStatus(dao.GetDB(), vendorIDs, vendorOrgCodes, nameIDs, model.SyncFlagModifiedMask)
+			}
+			retVal, err = cms.SyncSkus(params.Ctx, nil, vendorIDs, vendorOrgCodes, nameIDs, nil, params.IsAsync)
 		}
 		return retVal, "", err
 	})

globals/globals.go

@@ -47,7 +47,6 @@ var (
 	JdOrgCode  string
 	Jd2OrgCode string
 
-	IsUseThingMap bool
 	IsStoreSkuAct bool
 	IsAddEvent    bool
 
@@ -106,8 +105,6 @@ func Init() {
 	JdOrgCode = beego.AppConfig.DefaultString("jdOrgCode", "")
 	Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
 
-	IsUseThingMap = beego.AppConfig.DefaultBool("useThingMap", false)
-
 	IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
 	IsStoreSkuAct = !IsProductEnv()
 }