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

log

Browse Source
This commit is contained in:
richboo111
2022-07-27 16:09:01 +08:00
parent e8eac75f71
commit 6a06a29e54
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ type GetOrdersResult struct {
var TableOrder = "order"
func GetOrderByID(db *DaoDB, orderID string) (orderInfos *model.Order, err error) {
func GetOrderByID(db *DaoDB, orderID string) (*model.Order, error) {
sql := `SELECT * FROM order WHERE deleted_at = ? `
sqlParams := []interface{}{
utils.DefaultTimeValue,
@@ -135,12 +135,11 @@ func GetOrderByID(db *DaoDB, orderID string) (orderInfos *model.Order, err error
sql += "AND order_id = ?"
sqlParams = append(sqlParams, TableOrder, orderID)
}
txDB, _ := Begin(db)
defer Commit(db, txDB)
if err = GetRowsTx(txDB, &orderInfos, sql, sqlParams); err != nil {
orderInfos := &model.Order{}
if err := GetRow(db, orderInfos, sql, sqlParams); err != nil {
return nil, err
}
return orderInfos, err
return orderInfos, nil
}
func GetOrders(db *DaoDB, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {