From 1844055a4a5b46741d96a961e7b0bce6f8973159 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 7 Jun 2021 15:43:38 +0800
Subject: [PATCH] aa

---
 business/jxstore/misc/misc.go |  2 ++
 controllers/cms_store_sku.go  | 22 +++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 9de0471d3..203721ed1 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -281,6 +281,8 @@ func Init() {
 		ScheduleTimerFunc("SyncMatterC4ToGy", func() {
 			cms.SyncMatterC4ToGy(jxcontext.AdminCtx, true, true)
 		}, dailyWorkTimeList)
+
+		ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
 	}
 	if beego.BConfig.RunMode == "beta" {
 		//ScheduleTimerFunc("CancelPayTimeOutOrder", func() {
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index 98eb3dc0d..c00877cba 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -1,9 +1,6 @@
 package controllers
 
 import (
-	"math"
-	"time"
-
 	"git.rosy.net.cn/jx-callback/business/model"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
@@ -337,12 +334,11 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
 // @Title 得到商家商品销售情况
 // @Description 得到商家商品销售情况
 // @Param	token			header		string	true	"认证token"
-// @Param	storeIDs		query		string	true	"门店ID列表"
-// @Param	skuIDs			query		string	true	"Sku ID列表"
-// @Param	stFromTime		query		string	true	"统计SKU开始时间"
-// @Param	stToTime		query		string	false	"统计SKU结束时间"
-// @Param	stFromCount		query		int		false	"统计SKU，结果集起始数量（包括）"
-// @Param	stToCount		query		int		false	"统计SKU，结果集结束数量（包括）"
+// @Param	storeIDs		query		string	false	"门店ID列表"
+// @Param	skuIDs			query		string	false	"Sku ID列表"
+// @Param	skuNameIDs		query		string	false	"Skuname ID列表"
+// @Param	fromTime		query		string	false	"开始时间"
+// @Param	toTime			query		string	false	"结束时间"
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query		int		false	"门店列表页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult
@@ -352,18 +348,10 @@ func (c *StoreSkuController) GetStoresSkusSaleInfo() {
 	c.callGetStoresSkusSaleInfo(func(params *tStoreSkuGetStoresSkusSaleInfoParams) (retVal interface{}, errCode string, err error) {
 		var (
 			storeIDs, skuIDs []int
-			timeList         []time.Time
 		)
 		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs); err != nil {
 			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
 	})
 }