liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-07 15:43:38 +08:00
parent c4eecaffef
commit 1844055a4a
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/misc/misc.go
View File

@@ -281,6 +281,8 @@ func Init() {
ScheduleTimerFunc("SyncMatterC4ToGy", func() { ScheduleTimerFunc("SyncMatterC4ToGy", func() {
cms.SyncMatterC4ToGy(jxcontext.AdminCtx, true, true) cms.SyncMatterC4ToGy(jxcontext.AdminCtx, true, true)
}, dailyWorkTimeList) }, dailyWorkTimeList)
ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
} }
if beego.BConfig.RunMode == "beta" { if beego.BConfig.RunMode == "beta" {
//ScheduleTimerFunc("CancelPayTimeOutOrder", func() { //ScheduleTimerFunc("CancelPayTimeOutOrder", func() {

22
controllers/cms_store_sku.go
View File

@@ -1,9 +1,6 @@
package controllers package controllers
import ( import (
"math"
"time"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
@@ -337,12 +334,11 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
// @Title 得到商家商品销售情况 // @Title 得到商家商品销售情况
// @Description 得到商家商品销售情况 // @Description 得到商家商品销售情况
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param storeIDs query string true "门店ID列表" // @Param storeIDs query string false "门店ID列表"
// @Param skuIDs query string true "Sku ID列表" // @Param skuIDs query string false "Sku ID列表"
// @Param stFromTime query string true "统计SKU开始时间" // @Param skuNameIDs query string false "Skuname ID列表"
// @Param stToTime query string false "统计SKU结束时间" // @Param fromTime query string false "开始时间"
// @Param stFromCount query int false "统计SKU，结果集起始数量（包括）" // @Param toTime query string false "结束时间"
// @Param stToCount query int false "统计SKU，结果集结束数量（包括）"
// @Param offset query int false "门店列表起始序号（以0开始，缺省为0）" // @Param offset query int false "门店列表起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）" // @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
@@ -352,18 +348,10 @@ func (c *StoreSkuController) GetStoresSkusSaleInfo() {
c.callGetStoresSkusSaleInfo(func(params *tStoreSkuGetStoresSkusSaleInfoParams) (retVal interface{}, errCode string, err error) { c.callGetStoresSkusSaleInfo(func(params *tStoreSkuGetStoresSkusSaleInfoParams) (retVal interface{}, errCode string, err error) {
var ( var (
storeIDs, skuIDs []int storeIDs, skuIDs []int
timeList []time.Time
) )
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs); err != nil { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs); err != nil {
return retVal, "", err return retVal, "", err
} }
if timeList, err = jxutils.BatchStr2Time(params.StFromTime, params.StToTime); err != nil {
return retVal, "", err
}
if params.MapData["stToToCount"] == nil {
params.StToCount = math.MaxInt32
}
retVal, err = cms.GetStoresSkusSaleInfo(params.Ctx, storeIDs, skuIDs, timeList[0], timeList[1], params.StFromCount, params.StToCount)
return retVal, "", err return retVal, "", err
}) })
} }