diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 48d940566..460fc02e9 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1280,7 +1280,7 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuBindInfo *StoreSkuBindI } // todo 应该用updateStoresSkusWithoutSync实现 -func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string) (needSyncSkus []int, err error) { +func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBindSkuInfos []*StoreSkuBindSkuInfo, autoSaleTime time.Time, userName string) (needSyncSkus []int, err error) { var num int64 db := dao.GetDB() needSyncIDMap := make(map[int]int) @@ -1310,14 +1310,19 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind } else { skuBind.Status = model.StoreSkuBindStatusDontSale } - if num, err = dao.UpdateEntityLogically(db, skuBind, map[string]interface{}{ + kvs := map[string]interface{}{ model.FieldStatus: skuBind.Status, model.FieldJdSyncStatus: skuBind.JdSyncStatus | model.SyncFlagSaleMask, model.FieldEbaiSyncStatus: skuBind.EbaiSyncStatus | model.SyncFlagSaleMask, model.FieldMtwmSyncStatus: skuBind.MtwmSyncStatus | model.SyncFlagSaleMask, model.FieldElmSyncStatus: skuBind.ElmSyncStatus | model.SyncFlagSaleMask, model.FieldWscSyncStatus: skuBind.WscSyncStatus | model.SyncFlagSaleMask, - }, userName, nil); err != nil { + } + // if utils.IsTimeZero(autoSaleTime) || skuBind.Status == model.SkuStatusNormal { + // autoSaleTime = utils.DefaultTimeValue + // } + // kvs["AutoSaleAt"] = autoSaleTime + if num, err = dao.UpdateEntityLogically(db, skuBind, kvs, userName, nil); err != nil { dao.Rollback(db) return nil, err } @@ -1342,13 +1347,13 @@ func uniqueStoreSkuBind(skuBindSkuInfos []*StoreSkuBindSkuInfo) (outSkuBindSkuIn return outSkuBindSkuInfos } -func UpdateStoresSkusSale(ctx *jxcontext.Context, storeIDs []int, skuBindSkuInfos []*StoreSkuBindSkuInfo, userName string, isAsync, isContinueWhenError bool) (hint string, err error) { +func UpdateStoresSkusSale(ctx *jxcontext.Context, storeIDs []int, skuBindSkuInfos []*StoreSkuBindSkuInfo, autoSaleTime time.Time, userName string, isAsync, isContinueWhenError bool) (hint string, err error) { storeIDs = uniqueStoreIDs(storeIDs) skuBindSkuInfos = uniqueStoreSkuBind(skuBindSkuInfos) var num int64 for _, storeID := range storeIDs { - skuIDs, err2 := updateStoreSkusSaleWithoutSync(ctx, storeID, skuBindSkuInfos, userName) + skuIDs, err2 := updateStoreSkusSaleWithoutSync(ctx, storeID, skuBindSkuInfos, autoSaleTime, userName) if err = err2; err != nil { return "", err } @@ -2171,3 +2176,37 @@ func GetMissingStoreSkuFromOrder(ctx *jxcontext.Context, fromTime time.Time) (mi } return missingList, err } + +func AutoSaleStoreSku(ctx *jxcontext.Context, storeIDs []int) (err error) { + // db := dao.GetDB() + // storeSkuList, err := dao.GetAutoSaleStoreSku(db, storeIDs) + // if err != nil { + // return err + // } + // storeSkuMap := make(map[int][]*model.StoreSkuBind) + // for _, v := range storeSkuList { + // storeSkuMap[v.StoreID] = append(storeSkuMap[v.StoreID], v) + // } + // now := time.Now() + // for storeID, storeSkuList := range storeSkuMap { + // var skuIDs []int + // for _, storeSku := range storeSkuList { + // if now.Sub(storeSku.AutoSaleAt) > 0 { + // storeSku.AutoSaleAt = utils.DefaultTimeValue + // if storeSku.Status != model.SkuStatusNormal { + // storeSku.Status = model.SkuStatusNormal + // skuIDs = append(skuIDs, storeSku.SkuID) + // } + // if _, err = dao.UpdateEntity(db, storeSku, "AutoSaleAt", model.FieldStatus); err != nil { + // return err + // } + // } + // } + // if len(skuIDs) > 0 { + // if _, err = CurVendorSync.SyncStoresSkus(ctx, db, nil, []int{storeID}, skuIDs, false, true, true); err != nil { + // return err + // } + // } + // } + return err +} diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index c8e1857e9..4a74bb8ac 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -44,6 +44,12 @@ var ( updateActStatusTimeList = []string{ "00:01:00", } + + autoEnableStoreSkuTimeList = []string{ + "7:00:00", + "14:00:00", + "22:00:00", + } ) func Init() { @@ -70,6 +76,10 @@ func Init() { ScheduleTimerFunc(func() { dao.UpdateActStatusByTime(dao.GetDB(), time.Now().Add(-48*time.Hour)) }, updateActStatusTimeList) + + // ScheduleTimerFunc(func() { + // cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil) + // }, autoEnableStoreSkuTimeList) } } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 66923c9d4..89b89cfcd 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -480,3 +480,20 @@ func GetMissingStoreSkuFromOrder(db *DaoDB, storeIDs []int, fromTime time.Time) err = GetRows(db, &storeSkuList, sql, sqlParams...) return storeSkuList, err } + +func GetAutoSaleStoreSku(db *DaoDB, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) { + sql := ` + SELECT * + FROM store_sku_bind t1 + WHERE t1.deleted_at = ? AND t1.auto_sale_at <> ?` + sqlParams := []interface{}{ + utils.DefaultTimeValue, + utils.DefaultTimeValue, + } + if len(storeIDs) > 0 { + sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" + sqlParams = append(sqlParams, storeIDs) + } + err = GetRows(db, &storeSkuList, sql, sqlParams...) + return storeSkuList, err +} diff --git a/business/model/store_sku.go b/business/model/store_sku.go index be6942bde..4e1cfa3fa 100644 --- a/business/model/store_sku.go +++ b/business/model/store_sku.go @@ -103,6 +103,8 @@ type StoreSkuBind struct { EbaiSyncStatus int8 `orm:"default(2)"` MtwmSyncStatus int8 `orm:"default(2)"` WscSyncStatus int8 `orm:"default(2)"` + + // AutoSaleAt time.Time `orm:"type(datetime);null" json:"autoSaleAt"` } func (*StoreSkuBind) TableUnique() [][]string { diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 69c8154ee..16dd14bcd 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -265,6 +265,7 @@ func (c *StoreSkuController) CopyStoreSkus() { // @Param storeIDs formData string true "门店ID列表" // @Param payload formData string true "json数据，StoreSkuBindSkuInfo对象数组" // @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false" +// @Param autoSaleAt formData string false "自动可售时间" // @Param isAsync formData bool false "是否异步操作" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -276,7 +277,11 @@ func (c *StoreSkuController) UpdateStoresSkusSale() { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Payload, &skuBindSkuInfos); err != nil { return retVal, "", err } - retVal, err = cms.UpdateStoresSkusSale(params.Ctx, storeIDs, skuBindSkuInfos, params.Ctx.GetUserName(), params.IsAsync, params.IsContinueWhenError) + timeList, err := jxutils.BatchStr2Time(params.AutoSaleAt) + if err != nil { + return retVal, "", err + } + retVal, err = cms.UpdateStoresSkusSale(params.Ctx, storeIDs, skuBindSkuInfos, timeList[0], params.Ctx.GetUserName(), params.IsAsync, params.IsContinueWhenError) return retVal, "", err }) }