diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index f81426d38..c07fca7c5 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -2,6 +2,7 @@ package cms import ( "fmt" + "time" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -213,10 +214,9 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item if model.IsSyncStatusNew(syncStatus) { kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = sku.VendorSkuID } else if model.IsSyncStatusDelete(syncStatus) { - // todo 在storeSkuBind的DeletedAt为空时,应该设置,但当前sku.DeletedAt不是storeSkuBind的 - // if utils.IsTimeZero(sku.DeletedAt) { - // kvs[model.FieldDeletedAt] = time.Now() - // } + if utils.IsTimeZero(sku.BindDeletedAt) { + kvs[model.FieldDeletedAt] = time.Now() + } } } else if syncStatus&model.SyncFlagStockMask != 0 { if isStoreSkuSyncNeedDelete(sku) { diff --git a/business/model/dao/act.go b/business/model/dao/act.go index d20aafd6a..359a02ae3 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -396,8 +396,8 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs sql += " AND t2.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")" sqlParams = append(sqlParams, skuIDs) } - globals.SugarLogger.Debug(sql) - globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) + // globals.SugarLogger.Debug(sql) + // globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) err = GetRows(db, &actStoreSkuList, sql, sqlParams...) return actStoreSkuList, err } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 96407195a..83357f8fd 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -43,7 +43,8 @@ type StoreSkuSyncInfo struct { // 平台相关的store sku信息 StoreSkuStatus int StoreSkuSyncStatus int8 - VendorSkuID string `orm:"column(vendor_sku_id)"` + VendorSkuID string `orm:"column(vendor_sku_id)"` + BindDeletedAt time.Time `orm:"type(datetime);default('1970-01-01 00:00:00')" json:"bindDeletedAt"` model.Sku @@ -191,7 +192,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool) } fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) sql := ` - SELECT t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, t1.%s_sync_status store_sku_sync_status, %s vendor_name_id, t1.store_id, + SELECT t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, + t1.%s_sync_status store_sku_sync_status, %s vendor_name_id, t1.store_id, t1.deleted_at bind_deleted_at, t2.*, t3.id name_id, t3.prefix, t3.name, t3.unit, IF(t3.%s <> '', t3.%s, t3.img) img, t3.upc, t3.%s desc_img, t4.%s_category_id vendor_vendor_cat_id, t4.%s_price_percentage cat_price_percentage @@ -274,7 +276,8 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID) 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 store_sku_sync_status, t1.store_id, + 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 store_sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at, 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,