新SyncSkus基本能工作

2019-12-06 14:55:16 +08:00
parent 6806ab202d
commit 92ecba727d
11 changed files with 465 additions and 194 deletions
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -8,18 +8,10 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 )

-// type SkuStoreCatInfo struct {
-// 	model.SkuCategory
-
-// 	VendorID      int    `orm:"column(vendor_id)" json:"vendorID"`
-// 	VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
-
-// 	MapID       int    `orm:"column(map_id)" json:"mapID"`
-// 	VendorCatID string `orm:"size(32);column(vendor_cat_id)" json:"vendorCatID"`
-// 	SyncStatus  int8   `orm:"default(2)"`
-
-// 	VendorParentCatID string `orm:"size(32);column(vendor_parent_cat_id)" json:"vendorParentCatID"`
-// }
+type tStoreSkuSyncInfo2 struct {
+	StoreSkuSyncInfo
+	VendorPlaceCode string
+}

 func GetSellCities(db *DaoDB, nameID int, vendorID int) (cities []*model.Place, err error) {
 	cities = []*model.Place{}
@@ -157,6 +149,7 @@ func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int) (nu
 	return ExecuteSQL(db, sql, sqlParams...)
 }

+// 多门店平台使用，当前只有京东
 func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, parentCatID int, catIDs []int, mustDirty bool) (catList []*SkuStoreCatInfo, err error) {
 	sql := `
 	SELECT
@@ -180,7 +173,7 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?
 	LEFT JOIN sku_category t1p ON t1p.id = t1.parent_id
 	LEFT JOIN thing_map t1pm ON t1pm.thing_id = t1p.id AND t1pm.thing_type = ? AND t1m.deleted_at = ?
-	AND t1pm.vendor_id = t1m.vendor_id AND t1pm.vendor_org_code = t1m.vendor_org_code
+		AND t1pm.vendor_id = t1m.vendor_id AND t1pm.vendor_org_code = t1m.vendor_org_code
 	WHERE 1 = 1
 	`
 	sqlParams := []interface{}{
@@ -215,3 +208,90 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 	err = GetRows(db, &catList, sql, sqlParams...)
 	return catList, err
 }
+
+// 多门店平台使用，当前只有京东
+func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs, skuIDs []int, mustDirty bool) (skuList []*StoreSkuSyncInfo, err error) {
+	sql := `
+	SELECT
+	t1m.vendor_id, t1m.vendor_org_code,
+
+	t1m.id bind_id,
+	t1.*,
+	t1.id sku_id,
+	t1m.vendor_thing_id vendor_sku_id,
+	t1m.sync_status sku_sync_status,
+
+	t2.price,
+	t2.price unit_price,
+	t2.prefix,
+	t2.name,
+	t2.unit,
+	t2.upc,
+	t2.is_global,
+	t2.status name_status,
+	t2.img,
+	t2.img2,
+	t2.desc_img,
+
+	t5.jd_code vendor_place_code,
+
+	t3.jd_category_id vendor_vendor_cat_id,
+
+	t3m.sync_status cat_sync_status,
+	t3m.vendor_thing_id vendor_cat_id
+
+	FROM sku t1
+	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?
+	JOIN sku_name t2 ON t2.id = t1.name_id
+	LEFT JOIN sku_category t3 ON t3.id = t2.category_id
+	LEFT JOIN thing_map t3m ON t3m.thing_id = t3.id AND t3m.thing_type = ? AND t3m.deleted_at = ?
+		AND t3m.vendor_id = t1m.vendor_id AND t3m.vendor_org_code = t1m.vendor_org_code
+	LEFT JOIN sku_name_place_bind t4 ON t2.is_global = 0 AND t4.name_id = t1.name_id
+		LEFT JOIN place t5 ON t5.code = t4.place_code
+	WHERE 1 = 1
+	`
+	sqlParams := []interface{}{
+		model.ThingTypeSku,
+		utils.DefaultTimeValue,
+		model.ThingTypeCategory,
+		utils.DefaultTimeValue,
+	}
+	if mustDirty {
+		sql += " AND t1m.sync_status <> 0"
+	} else {
+		sql += " AND t1.deleted_at = ?"
+		sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	}
+	if len(vendorIDs) > 0 {
+		sql += " AND t1m.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, vendorIDs)
+	}
+	if len(appOrgCodes) > 0 {
+		sql += " AND t1m.vendor_org_code IN (" + GenQuestionMarks(len(appOrgCodes)) + ")"
+		sqlParams = append(sqlParams, appOrgCodes)
+	}
+	if len(nameIDs) > 0 {
+		sql += " AND t1.name_id IN (" + GenQuestionMarks(len(nameIDs)) + ")"
+		sqlParams = append(sqlParams, nameIDs)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND t1.id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	sql += " ORDER BY t1.seq"
+
+	var list []*tStoreSkuSyncInfo2
+	if err = GetRows(db, &list, sql, sqlParams...); err == nil {
+		skuMap := make(map[int]*StoreSkuSyncInfo)
+		for _, v := range list {
+			if skuMap[v.SkuID] == nil {
+				skuMap[v.SkuID] = &v.StoreSkuSyncInfo
+				skuList = append(skuList, &v.StoreSkuSyncInfo)
+			}
+			if !IsVendorThingIDEmpty(v.VendorPlaceCode) {
+				skuMap[v.SkuID].SellCities = append(skuMap[v.SkuID].SellCities, v.VendorPlaceCode)
+			}
+		}
+	}
+	return skuList, err
+}
--- a/business/model/dao/sku_test.go
+++ b/business/model/dao/sku_test.go
@@ -0,0 +1,16 @@
+package dao
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+func TestGetSkusWithVendor(t *testing.T) {
+	skuList, err := GetSkusWithVendor(GetDB(), nil, nil, []int{17368}, nil, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	globals.SugarLogger.Debug(utils.Format4Output(skuList, false))
+}
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -40,6 +40,9 @@ type SkuStoreCatInfo struct {
 }

 type StoreSkuSyncInfo struct {
+	VendorID      int    `orm:"column(vendor_id)" json:"vendorID"`
+	VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
+
 	// 平台无关的store sku信息
 	BindID  int `orm:"column(bind_id)"` // 换名的原因是与Sku.ID同名区别
 	StoreID int `orm:"column(store_id)"`
@@ -57,12 +60,15 @@ type StoreSkuSyncInfo struct {
 	model.Sku

 	// sku_name
-	Prefix       string
-	NameID       int    `orm:"column(name_id)"`
-	VendorNameID string `orm:"column(vendor_name_id)"`
+	Prefix string
+	// NameID       int    `orm:"column(name_id)"`
+	VendorNameID string `orm:"column(vendor_name_id)"` // 暂时无用
 	Name         string
 	Unit         string
 	Upc          string
+	IsGlobal     int8 `orm:"default(1)" json:"isGlobal"` // 是否是全部（全国）可见，如果否的话，可见性由SkuPlace决定
+	NameStatus   int
+	SellCities   []string

 	// 平台相关的图片信息
 	Img     string
@@ -71,11 +77,6 @@ type StoreSkuSyncInfo struct {

 	VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）

-	// 饿百也只需要给出叶子结点了
-	// https://open-be.ele.me/dev/notice?id=275
-	// VendorVendorCatID2 int64 `orm:"column(vendor_vendor_cat_id2)"` // 平台商品分类上一级
-	// VendorVendorCatID3 int64 `orm:"column(vendor_vendor_cat_id3)"` // 平台商品分类再上一级
-
 	// sku的商家分类信息
 	SkuCatSyncStatus int8
 	SkuVendorCatID   string `orm:"column(sku_vendor_cat_id)"`