- 重构GetSkusCategories与GetStoreCategories

business/model/dao/store_sku.go

@@ -30,17 +30,6 @@ type SkuStoreCatInfo struct {
 	ParentCatSyncStatus int8
 }
 
-type StoreCatSyncInfo struct {
-	CatName string
-	Seq     int `json:"seq"`
-	model.StoreSkuCategoryMap
-
-	ParentCatName       string
-	ParentCatID         int    `orm:"column(parent_cat_id)"` // 这个主要用于判断是否有父store_sku_category_map
-	ParentVendorCatID   string `orm:"column(parent_vendor_cat_id)"`
-	ParentCatSyncStatus int8
-}
-
 type StoreSkuSyncInfo struct {
 	// 平台无关的store sku信息
 	BindID    int `orm:"column(bind_id)"` // 换名的原因是与Sku.ID同名区别
@@ -82,6 +71,7 @@ type StoreSkuSyncInfo struct {
 }
 
 // 单门店模式厂商适用
+// 从store_sku_bind中，得到所有依赖的商家分类信息
 func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int) (cats []*SkuStoreCatInfo, err error) {
 	sql := `
 	SELECT DISTINCT t4.*, t5.id map_id, t5.%s_id vendor_cat_id, t5.%s_sync_status store_cat_sync_status, t4p.name parent_cat_name, t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status
@@ -129,19 +119,20 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int
 }
 
 // 单门店模式厂商适用
-func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats []*StoreCatSyncInfo, err error) {
+// 单纯的从已经创建的store_sku_category_map中，得到相关的同步信息
+func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats []*SkuStoreCatInfo, err error) {
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
 	sql := fmt.Sprintf(`
-	SELECT t5.*,
-	t4.name cat_name, t4.seq,
+	SELECT t4.*,
+	t5.id map_id, t5.%s_id vendor_cat_id, t5.%s_sync_status store_cat_sync_status,
 	t4p.name parent_cat_name,
-	t5p.category_id parent_cat_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status
+	t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status
 	FROM store_sku_category_map t5
 	JOIN sku_category t4 ON t5.category_id = t4.id AND t4.deleted_at = ?
 	LEFT JOIN sku_category t4p ON t4.parent_id = t4p.id
 	LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5.store_id = t5p.store_id AND t5p.deleted_at = ?
 	WHERE t5.store_id = ? AND t4.level = ? AND t5.%s_sync_status <> 0 AND t5.deleted_at = ?
-	`, fieldPrefix, fieldPrefix, fieldPrefix)
+	`, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
 	if err = GetRows(db, &cats, sql, utils.DefaultTimeValue, utils.DefaultTimeValue, storeID, level, utils.DefaultTimeValue); err != nil {
 		return nil, err
 	}