diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 318b98741..ef0b820f2 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -63,10 +63,10 @@ type StoreSkuExt struct { MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"` WscSyncStatus int8 `orm:"default(2)" json:"wscSyncStatus"` - // JdPrice int `json:"jdPrice"` - // EbaiPrice int `json:"ebaiPrice"` - // MtwmPrice int `json:"mtwmPrice"` - // WscPrice int `json:"wscPrice"` + JdPrice int `json:"jdPrice"` + EbaiPrice int `json:"ebaiPrice"` + MtwmPrice int `json:"mtwmPrice"` + WscPrice int `json:"wscPrice"` AutoSaleAt time.Time `orm:"type(datetime);null" json:"autoSaleAt"` @@ -393,8 +393,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo 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, t4.ebai_id, t4.mtwm_id, t4.wsc_id, t4.wsc_id2, - t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.wsc_sync_status/*, - t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.wsc_price*/ + t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.wsc_sync_status, + t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.wsc_price ` + sql var tmpList []*tGetStoresSkusInfo beginTime := time.Now() diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 8c85ea099..72c4466ba 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -229,9 +229,9 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item sku.StoreSkuSyncStatus = sku.StoreSkuSyncStatus & ^syncStatus } kvs[dao.GetSyncStatusStructField(model.VendorNames[vendorID])] = sku.StoreSkuSyncStatus - // if sku.VendorPrice > 0 { - // kvs[dao.GetVendorPriceStructField(model.VendorNames[vendorID])] = sku.VendorPrice - // } + if sku.VendorPrice > 0 { + kvs[dao.GetVendorPriceStructField(model.VendorNames[vendorID])] = sku.VendorPrice + } storeSku := &model.StoreSkuBind{} storeSku.ID = sku.BindID item = &dao.KVUpdateItem{ diff --git a/business/model/store_sku.go b/business/model/store_sku.go index b87c88b32..a1b7ce926 100644 --- a/business/model/store_sku.go +++ b/business/model/store_sku.go @@ -105,10 +105,10 @@ type StoreSkuBind struct { MtwmSyncStatus int8 `orm:"default(2)"` WscSyncStatus int8 `orm:"default(2)"` - // JdPrice int `json:"jdPrice"` - // EbaiPrice int `json:"ebaiPrice"` - // MtwmPrice int `json:"mtwmPrice"` - // WscPrice int `json:"wscPrice"` + JdPrice int `json:"jdPrice"` + EbaiPrice int `json:"ebaiPrice"` + MtwmPrice int `json:"mtwmPrice"` + WscPrice int `json:"wscPrice"` AutoSaleAt time.Time `orm:"type(datetime);null" json:"autoSaleAt"` }