liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-09-19 10:09:47 +08:00
parent b6908eff84
commit ad83dbd4e2
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/model/dao/store.go
View File

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

2
controllers/jx_order.go
View File

@@ -557,7 +557,7 @@ func (c *OrderController) StaleIndexInfo() {
return retVal, "", fmt.Errorf("该用户%s,暂无门店信息", ctx.GetUserName()) 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 return retVal, "", err
}) })
} }