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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-11-18 14:50:42 +08:00
parent 4113a7c837 0cfa20578c
commit b46ad9924b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -940,6 +940,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
} else { } else {
sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")"
sqlParams = append(sqlParams, storeIDs) sqlParams = append(sqlParams, storeIDs)
globals.SugarLogger.Debugf("sqlParams storeIDs========%d", storeIDs)
} }
} }
} }
@@ -951,6 +952,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if len(statuss) > 0 { if len(statuss) > 0 {
sqlWhere += " AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")" sqlWhere += " AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")"
sqlParams = append(sqlParams, statuss) sqlParams = append(sqlParams, statuss)
globals.SugarLogger.Debugf("sqlParams statuss===========%d", statuss)
} }
} }
if params["lockStatuss"] != nil { if params["lockStatuss"] != nil {
@@ -1022,6 +1024,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if params["adjustCount"] != nil { if params["adjustCount"] != nil {
sqlWhere += " AND t1.adjust_count >= ?" sqlWhere += " AND t1.adjust_count >= ?"
sqlParams = append(sqlParams, params["adjustCount"]) sqlParams = append(sqlParams, params["adjustCount"])
globals.SugarLogger.Debugf("sqlParams params[adjustCount]=========%d", params["adjustCount"])
} }
if mustInvoice, ok := params["mustInvoice"].(bool); ok && mustInvoice { if mustInvoice, ok := params["mustInvoice"].(bool); ok && mustInvoice {
sqlWhere += " AND t1.invoice_taxer_id <> ''" sqlWhere += " AND t1.invoice_taxer_id <> ''"
@@ -1035,6 +1038,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if len(vendorIDs) > 0 { if len(vendorIDs) > 0 {
sqlWhere += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")" sqlWhere += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
sqlParams = append(sqlParams, vendorIDs) sqlParams = append(sqlParams, vendorIDs)
globals.SugarLogger.Debugf("sqlParams vendorIDs================%d", vendorIDs)
} }
} }
if userID != "" { if userID != "" {
@@ -1075,7 +1079,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
} }
sql += " LIMIT ? OFFSET ?" sql += " LIMIT ? OFFSET ?"
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
globals.SugarLogger.Debugf("test sql sqlsqlParams===============%s %s\n", sql, sqlParams) globals.SugarLogger.Debugf("sqlParams pageSize=====%d,offset==========%d", pageSize, offset)
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {