From 68783034bcc3636edca509ead18e85d57fdcbb01 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 7 Jun 2021 16:25:27 +0800
Subject: [PATCH] aa

---
 business/jxstore/misc/misc.go | 18 ++++++++----------
 controllers/cms_store_sku.go  |  3 +++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 203721ed1..64a432e46 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -47,7 +47,7 @@ var (
 		"20:30:00",
 	}
 	dailyWorkTimeList2 = []string{
-		"02:00:00",
+		"2:00:00",
 	}
 	priceReferTimeList = []string{
 		"03:00:00",
@@ -164,7 +164,7 @@ func Init() {
 	if globals.IsProductEnv() {
 		ScheduleTimerFunc("doDailyWork", doDailyWork, dailyWorkTimeList)
 
-		ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
+		//ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
 
 		//京东的订单信息解密密钥获取
 		ScheduleTimerFuncByInterval(func() {
@@ -281,8 +281,6 @@ func Init() {
 		ScheduleTimerFunc("SyncMatterC4ToGy", func() {
 			cms.SyncMatterC4ToGy(jxcontext.AdminCtx, true, true)
 		}, dailyWorkTimeList)
-
-		ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2)
 	}
 	if beego.BConfig.RunMode == "beta" {
 		//ScheduleTimerFunc("CancelPayTimeOutOrder", func() {
@@ -426,12 +424,6 @@ func doDailyWork2() {
 	// cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城的门店库存
 	// cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true)
-	//刷新京东商城订单结算价
-	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now()))
-	//刷新门店分组管理
-	cms.RefreshStoreBind(jxcontext.AdminCtx)
-	//刷新京东会员
-	report.RefreshJDMembers(jxcontext.AdminCtx)
 }
 
 func doDailyWork() {
@@ -473,6 +465,12 @@ func doDailyWork() {
 	cms.SetMTPSStatus(jxcontext.AdminCtx, 0, 0)
 	//售后单如果超过12小时没有审核，就自动通过
 	RefreshAfsOrderStatusAccess(jxcontext.AdminCtx)
+	//刷新京东商城订单结算价
+	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now()))
+	//刷新门店分组管理
+	cms.RefreshStoreBind(jxcontext.AdminCtx)
+	//刷新京东会员
+	report.RefreshJDMembers(jxcontext.AdminCtx)
 }
 
 func refreshPointOrderNewEarningPrice() {
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index c00877cba..7772fab90 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -339,6 +339,9 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
 // @Param	skuNameIDs		query		string	false	"Skuname ID列表"
 // @Param	fromTime		query		string	false	"开始时间"
 // @Param	toTime			query		string	false	"结束时间"
+// @Param	saleCountBegin	query		string	false	"销量begin"
+// @Param	saleCountEnd	query		string	false	"销量end"
+// @Param	sortType		query		int		false	""
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query		int		false	"门店列表页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult