From ad83dbd4e2816e30a5cf4d16d3abad94c146bd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 19 Sep 2025 10:09:47 +0800
Subject: [PATCH] 1

---
 business/model/dao/store.go | 7 ++-----
 controllers/jx_order.go     | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 17a2f4c34..1e5c5fbac 100644
--- a/business/model/dao/store.go
+++ b/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)
 	}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 8ed71b429..d9aee4dfd 100644
--- a/controllers/jx_order.go
+++ b/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
 	})
 }