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

aa

Browse Source
This commit is contained in:
suyl
2021-06-04 17:07:25 +08:00
parent 6e6a16b7f1
commit bd428e9a0d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/model/dao/dao_order.go
View File

@@ -771,8 +771,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
offset = jxutils.FormalizePageOffset(offset) offset = jxutils.FormalizePageOffset(offset)
sql := fmt.Sprintf(` sql := fmt.Sprintf(`
SELECT a.* FROM ( SELECT SQL_CALC_FOUND_ROWS a.* FROM (
SELECT SQL_CALC_FOUND_ROWS SELECT
DISTINCT t1.*, DISTINCT t1.*,
CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price, CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
t2.status waybill_status, t2.courier_name, t2.courier_mobile, t2.status waybill_status, t2.courier_name, t2.courier_mobile,
@@ -987,8 +987,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
} }
} }
sql += ` sql += `
LIMIT ? OFFSET ?) a WHERE 1 = 1` ) a WHERE 1 = 1`
sqlParams = append(sqlParams, pageSize, offset)
if params["jxIncomeBegin"] != nil { if params["jxIncomeBegin"] != nil {
if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 { if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 {
sqlWhere += " AND jx_income >= ?" sqlWhere += " AND jx_income >= ?"
@@ -1001,10 +1000,10 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"])) sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"]))
} }
} }
sql += " LIMIT ? OFFSET ?"
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
fmt.Println(sql)
fmt.Println(sqlParams)
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
totalCount = GetLastTotalRowCount2(db, txDB) totalCount = GetLastTotalRowCount2(db, txDB)
} }