Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm
This commit is contained in:
@@ -675,7 +675,7 @@ func SetOrderStatus(db *DaoDB, orderID string, status int) (msg string, err erro
|
||||
sqlParams = append(sqlParams, status)
|
||||
}
|
||||
if orderID != "" {
|
||||
sql += `WHERE order_id = ?`
|
||||
sql += `AND WHERE order_id = ?`
|
||||
sqlParams = append(sqlParams, orderID)
|
||||
}
|
||||
orderInfos := &model.Order{}
|
||||
@@ -691,7 +691,7 @@ func SetUserVendorOrderStatus(db *DaoDB, localWayBillID string, status int) (msg
|
||||
sqlParams = append(sqlParams, status)
|
||||
}
|
||||
if localWayBillID != "" {
|
||||
sql += `WHERE local_way_bill = ?`
|
||||
sql += `AND WHERE local_way_bill = ?`
|
||||
sqlParams = append(sqlParams, localWayBillID)
|
||||
}
|
||||
orderInfos := &model.Order{}
|
||||
|
||||
Reference in New Issue
Block a user