1
This commit is contained in:
@@ -2012,7 +2012,7 @@ func GetAddressRiderInfo(db *DaoDB, address string) ([]*CourierInfo, error) {
|
||||
return courier, nil
|
||||
}
|
||||
|
||||
func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank string, offSet, pageSize int) ([]*StoreOrderRank, error) {
|
||||
func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank string, offSet, pageSize int) ([]*StoreOrderRank, int, error) {
|
||||
dailyOrders := `
|
||||
SELECT
|
||||
g.jx_store_id,
|
||||
@@ -2079,10 +2079,22 @@ func StaticStoreOrderChange(db *DaoDB, storeId []int, start, end time.Time, rank
|
||||
lastSql += " LIMIT ? OFFSET ?"
|
||||
dailyParam = append(dailyParam, pageSize, offSet)
|
||||
data := make([]*StoreOrderRank, 0, 0)
|
||||
if err := GetRows(db, &data, lastSql, dailyParam...); err != nil {
|
||||
return nil, err
|
||||
|
||||
txDB, _ := Begin(db)
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
Rollback(db, txDB)
|
||||
panic(r)
|
||||
}
|
||||
}()
|
||||
defer Commit(db, txDB)
|
||||
if err := GetRowsTx(txDB, &data, lastSql, dailyParam...); err != nil {
|
||||
Rollback(db, txDB)
|
||||
return nil, 0, err
|
||||
}
|
||||
return data, nil
|
||||
totalCount := GetLastTotalRowCount2(db, txDB)
|
||||
|
||||
return data, totalCount, nil
|
||||
}
|
||||
|
||||
// StoreOrderRank 门店订单排名
|
||||
|
||||
Reference in New Issue
Block a user