冲突处理

2020-01-06 08:54:48 +08:00
parent 36a46455ce 13922ead60
commit b8bdea90f3
10 changed files with 173 additions and 66 deletions
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -105,7 +105,7 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
 		sqlParams = append(sqlParams, storeID)
 	}
 	if !utils.IsTimeZero(fromDate) && !utils.IsTimeZero(toDate) {
-		sql += " AND a.order_created_at BETWEEN ? and ?"
+		sql += " AND a.order_created_at BETWEEN ? AND ?"
 		sqlParams = append(sqlParams, fromDate, toDate)
 	}
 	err = GetRows(db, &orderNewList, sql, sqlParams...)