- first edition of weimob wsc.

business/model/dao/dao_bz.go

@@ -112,8 +112,10 @@ func DeleteEntityLogically(db *DaoDB, item interface{}, kvs map[string]interface
 
 func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendorCategoryID string, status int8, userName string) (err error) {
 	storeCat := &model.StoreSkuCategoryMap{
-		StoreID:    storeID,
-		CategoryID: categoryID,
+		StoreID:        storeID,
+		CategoryID:     categoryID,
+		MtwmSyncStatus: model.SyncFlagNewMask,
+		WscSyncStatus:  model.SyncFlagNewMask,
 	}
 	storeCat.DeletedAt = utils.DefaultTimeValue
 	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows {

business/model/dao/sku.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
@@ -50,3 +51,18 @@ func GetSkuNameByHashCode(db *DaoDB, hashCode string) (skuName *model.SkuName, e
 	}
 	return nil, err
 }
+
+func GetSkuNames(db *DaoDB) (skuNameList []*model.SkuName, err error) {
+	sql := `
+	SELECT *
+	FROM sku_name
+	WHERE deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if err = GetRows(db, &skuNameList, sql, sqlParams...); err == nil {
+		return skuNameList, nil
+	}
+	return nil, err
+}

business/model/dao/store_sku.go

@@ -38,8 +38,9 @@ type StoreSkuSyncInfo struct {
 	StoreSkuStatus int
 	SkuSyncStatus  int8
 	model.Sku
-	VendorSkuID int64 `orm:"column(vendor_sku_id)"`
+	VendorSkuID string `orm:"column(vendor_sku_id)"`
 	Prefix      string
+	NameID      int `orm:"column(name_id)"`
 	Name        string
 	Unit        string
 	Img         string
@@ -119,10 +120,14 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 	if model.MultiStoresVendorMap[vendorID] == 1 { // 多店模式平台
 		tableName = "t2"
 	}
+	imgField := "img"
+	if vendorID == model.VendorIDWSC {
+		imgField = "img_weimob"
+	}
 	sql := `
 	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status,
 	t2.*,
-	t3.prefix, t3.name, t3.unit, t3.img, t3.upc,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.%s img, t3.upc,
 	t4.%s_category_id vendor_vendor_cat_id,
 	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
@@ -144,9 +149,10 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
+	sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, imgField, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
 	// globals.SugarLogger.Debug(sql)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
+		globals.SugarLogger.Debug("fuck")
 		return nil, err
 	}
 	return skus, err
@@ -159,7 +165,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	sql := `
 	SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, t2.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status,
 	t2.*,
-	t3.prefix, t3.name, t3.unit, t3.img,
+	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.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