- 重构dao.store_sku中的命名

business/model/dao/store_sku.go

@@ -20,9 +20,9 @@ var (
 
 type SkuStoreCatInfo struct {
 	model.SkuCategory
-	MapID         int    `orm:"column(map_id)"` // 这个主要用于判断是否有store_sku_category_map
+	MapID              int    `orm:"column(map_id)"` // 这个主要用于判断是否有store_sku_category_map
-	VendorCatID   string `orm:"column(vendor_cat_id)"`
+	VendorCatID        string `orm:"column(vendor_cat_id)"`
-	CatSyncStatus int8
+	StoreCatSyncStatus int8
 
 	ParentCatName       string
 	ParentMapID         int    `orm:"column(parent_map_id)"` // 这个主要用于判断是否有父store_sku_category_map
@@ -71,12 +71,12 @@ type StoreSkuSyncInfo struct {
 	VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类
 
 	// sku的商家分类信息
-	SkuCatSyncStatus int8
+	SkuStoreCatSyncStatus int8
-	SkuVendorCatID   string `orm:"column(sku_vendor_cat_id)"`
+	SkuVendorCatID        string `orm:"column(sku_vendor_cat_id)"`
 
 	// sku_name的商家分类信息
-	CatSyncStatus int8
+	StoreCatSyncStatus int8
-	VendorCatID   string `orm:"column(vendor_cat_id)"`
+	VendorCatID        string `orm:"column(vendor_cat_id)"`
 
 	CatPricePercentage int
 }
@@ -84,7 +84,7 @@ type StoreSkuSyncInfo struct {
 // 单门店模式厂商适用
 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 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
+	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
 	FROM store_sku_bind t1
 	JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ?
 	JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ?
@@ -173,8 +173,8 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 	}
 	if isSingleStorePF {
 		sql += `,
-		t5.%s_sync_status cat_sync_status, t5.%s_id vendor_cat_id,
+		t5.%s_sync_status store_cat_sync_status, t5.%s_id vendor_cat_id,
-		t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id`
+		t5sku.%s_sync_status sku_store_cat_sync_status, t5sku.%s_id sku_vendor_cat_id`
 		fmtParams = append(fmtParams, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
 	}
 	sql += `
@@ -221,8 +221,8 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	t2.*, t2.id sku_id,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, IF(t3.%s <> '', t3.%s, t3.img) img,
 	t4.%s_category_id vendor_vendor_cat_id,
-	t4.%s_sync_status cat_sync_status, t4.%s_id vendor_cat_id,
+	t4.%s_sync_status store_cat_sync_status, t4.%s_id vendor_cat_id,
-	t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id
+	t5sku.%s_sync_status sku_store_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 = ?

business/partner/purchase/elm/order.go

@@ -16,6 +16,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 )
 
@@ -186,7 +187,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 				SalePrice:     jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
 				Weight:        int(math.Round(utils.Interface2Float64WithDefault(product["weight"], 0.0))),
 			}
-			if sku.VendorSkuID == "0" {
+			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
 				sku.VendorSkuID = utils.Int64ToStr(utils.MustInterface2Int64(product["id"])) // 2018-09-28日，饿了么迁移到饿百后，这个字段发生了变化
 			}
 			order.Skus = append(order.Skus, sku)

business/partner/purchase/mtwm/store_sku.go

@@ -175,7 +175,7 @@ func (p *PurchaseHandler) SyncLocalStoreCategory(ctx *jxcontext.Context, db *dao
 					return "", err
 				}
 			} else {
-				if v.VendorCatID == "" || v.VendorCatID == "0" {
+				if dao.IsVendorThingIDEmpty(v.VendorCatID) {
 					num++
 				}
 				if isCheckRemote {

business/partner/purchase/weimob/wsc/store_sku.go

@@ -129,7 +129,7 @@ func (p *PurchaseHandler) SyncLocalStoreCategory(ctx *jxcontext.Context, db *dao
 					return "", err
 				}
 			} else {
-				if (v.VendorCatID == "0" || v.VendorCatID == "") && ((v.CatSyncStatus & model.SyncFlagNewMask) == 0) {
+				if dao.IsVendorThingIDEmpty(v.VendorCatID) && ((v.StoreCatSyncStatus & model.SyncFlagNewMask) == 0) {
 					catMap := &model.StoreSkuCategoryMap{}
 					catMap.ID = v.MapID
 					if _, err = dao.UpdateEntityLogically(db, catMap, map[string]interface{}{