diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index b383472e9..4b510588a 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -2025,15 +2025,15 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank dailyOrders += ` AND g.jx_store_id IN (` + GenQuestionMarks(len(storeId)) + `)` dailyParam = append(dailyParam, storeId) } - if utils.IsTimeZero(start) { + if !utils.IsTimeZero(start) { dailyOrders += ` AND g.order_created_at >= ?` dailyParam = append(dailyParam, start) } - if utils.IsTimeZero(end) { + if !utils.IsTimeZero(end) { dailyOrders += ` AND g.order_created_at <= ?` dailyParam = append(dailyParam, start) } - dailyOrders += ` AND g.status <> 115 GROUP BY g.jx_store_id,DATE(g.order_created_at) AS daily_orders ` + dailyOrders += ` AND g.status <> 115 GROUP BY g.jx_store_id,DATE(g.order_created_at) )AS daily_orders ` storeTotals := ` SELECT @@ -2049,11 +2049,11 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank storeTotals += ` AND g.jx_store_id IN (` + GenQuestionMarks(len(storeId)) + `)` dailyParam = append(dailyParam, storeId) } - if utils.IsTimeZero(start) { + if !utils.IsTimeZero(start) { storeTotals += ` AND g.order_created_at >= ?` dailyParam = append(dailyParam, start) } - if utils.IsTimeZero(end) { + if !utils.IsTimeZero(end) { storeTotals += ` AND g.order_created_at <= ?` dailyParam = append(dailyParam, start) } @@ -2069,7 +2069,7 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank FROM ( ` lastSql += dailyOrders - lastSql += `JOIN ` + storeTotals + lastSql += `JOIN (` + storeTotals lastSql += `ON daily_orders.jx_store_id = store_totals.jx_store_id JOIN store s ON s.id = daily_orders.jx_store_id ORDER BY store_totals.total_orders ?,daily_orders.jx_store_id,daily_orders.order_date` diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 5b1084e32..88353d56b 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -579,46 +579,46 @@ func (c *OrderController) StaleIndexInfo() { func (c *OrderController) StoreOrderRank() { c.callStoreOrderRank(func(params *tOrderStoreOrderRankParams) (retVal interface{}, code string, err error) { var ( - storeList []*dao.StoreWithCityName - dataList = make([]int, 0, len(storeList)) - mapDataList = make(map[int]int, len(storeList)) + //storeList []*dao.StoreWithCityName + //dataList = make([]int, 0, len(storeList)) + //mapDataList = make(map[int]int, len(storeList)) ) timeList, err := jxutils.BatchStr2Time(params.Start, params.End) if err != nil { return nil, "", err } var storeIdList []int - if err = jxutils.Strings2Objs(params.StoreID, &storeIdList); err == nil { + if err = jxutils.Strings2Objs(params.StoreID, &storeIdList); err != nil { return nil, "", err } - ctx := params.Ctx - if !auth2.IsV2Token(ctx.GetToken()) { - return nil, model.ErrCodeTokenIsInvalid, model.ErrTokenIsInvalid - } - mobile, userID := ctx.GetMobileAndUserID() - if mobile == "" || userID == "" || userID == "null" || userID == "NULL" { - return nil, "", fmt.Errorf("不能得到用户手机号,%s,%s", userID, mobile) - } - - if permission.IsRoled(ctx) { - if storeList, err = cms.GetStoreList4User(ctx, mobile, userID); err == nil && len(storeList) > 0 { - for _, v := range storeList { - dataList = append(dataList, v.Store.ID) - mapDataList[v.Store.ID] = model.YES - } - } - if len(storeIdList) != model.NO { - for _, sl := range storeIdList { - if mapDataList[sl] != model.YES { - return retVal, "", fmt.Errorf("此门店%d,不归属于该用户%s", sl, ctx.GetUserName()) - } - } - } - } - if len(storeIdList) == model.NO { - storeIdList = dataList - } + //ctx := params.Ctx + //if !auth2.IsV2Token(ctx.GetToken()) { + // return nil, model.ErrCodeTokenIsInvalid, model.ErrTokenIsInvalid + //} + //mobile, userID := ctx.GetMobileAndUserID() + //if mobile == "" || userID == "" || userID == "null" || userID == "NULL" { + // return nil, "", fmt.Errorf("不能得到用户手机号,%s,%s", userID, mobile) + //} + // + //if permission.IsRoled(ctx) { + // if storeList, err = cms.GetStoreList4User(ctx, mobile, userID); err == nil && len(storeList) > 0 { + // for _, v := range storeList { + // dataList = append(dataList, v.Store.ID) + // mapDataList[v.Store.ID] = model.YES + // } + // } + // if len(storeIdList) != model.NO { + // for _, sl := range storeIdList { + // if mapDataList[sl] != model.YES { + // return retVal, "", fmt.Errorf("此门店%d,不归属于该用户%s", sl, ctx.GetUserName()) + // } + // } + // } + //} + //if len(storeIdList) == model.NO { + // storeIdList = dataList + //} retVal, err = dao.StaticStoreOrderChange(dao.GetDB(), storeIdList, timeList[0], timeList[1], params.Rank) return retVal, "", err })