1

business/model/dao/store.go

@@ -3,7 +3,6 @@ package dao
 import (
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/globals"
 	"sort"
 	"strings"
 	"time"
@@ -1598,8 +1597,6 @@ func StatisticsStoreInfo(db *DaoDB, brandId, vendorId, storeList []int, operateN
 	}
 
 	sql += ` GROUP BY s.status `
-	globals.SugarLogger.Debugf("---------sql := %s", sql)
-	globals.SugarLogger.Debugf("---------sql := %s", utils.Format4Output(param, false))
 	if err := GetRows(db, &statistics, sql, param); err != nil {
 		return nil, err
 	}
@@ -1703,11 +1700,11 @@ func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, bran
 		parma = append(parma, storeList)
 	}
 
-	if len(brandId) > model.NO {
+	if operateNum != "" {
 		sql += ` AND t3.market_man_phone = ?`
 		parma = append(parma, operateNum)
 	}
-	if operateNum != "" {
+	if brandOperate != "" {
 		sql += ` AND t3.operator_phone2 = ?`
 		parma = append(parma, brandOperate)
 	}

controllers/jx_order.go

@@ -557,7 +557,7 @@ func (c *OrderController) StaleIndexInfo() {
 			return retVal, "", fmt.Errorf("该用户%s,暂无门店信息", ctx.GetUserName())
 		}
 
-		retVal, err = orderman.FixedOrderManager.GetStoresOrderSaleInfo2(timeList[0], timeList[1], params.StoreID, brandIds, vendors, dataList, params.BrandOperator, params.OperatorNumber)
+		retVal, err = orderman.FixedOrderManager.GetStoresOrderSaleInfo2(timeList[0], timeList[1], params.StoreID, brandIds, vendors, dataList, params.OperatorNumber, params.BrandOperator)
 		return retVal, "", err
 	})
 }