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

This commit is contained in:
邹宗楠
2022-07-27 18:13:53 +08:00

View File

@@ -670,12 +670,12 @@ func GetUnionOrdersPage(db *DaoDB, vendorIDs, statuss []int, beginTime, endTime
}
func SetOrderStatus(db *DaoDB, orderID string, status int) (msg string, err error) {
sqlParams := []interface{}{}
sql := `UPDATE order SET status = ? `
sql := `UPDATE order o SET o.status = ? `
if status > 0 {
sqlParams = append(sqlParams, status)
}
if orderID != "" {
sql += `WHERE order_id = ?`
sql += `WHERE o.order_id = ?`
sqlParams = append(sqlParams, orderID)
}
orderInfos := &model.Order{}
@@ -686,12 +686,12 @@ func SetOrderStatus(db *DaoDB, orderID string, status int) (msg string, err erro
}
func SetUserVendorOrderStatus(db *DaoDB, localWayBillID string, status int) (msg string, err error) {
sqlParams := []interface{}{}
sql := `UPDATE user_vendor_order SET order_status = ?`
sql := `UPDATE user_vendor_order a SET a.order_status = ?`
if status > 0 {
sqlParams = append(sqlParams, status)
}
if localWayBillID != "" {
sql += `AND WHERE local_way_bill = ?`
sql += `WHERE a.local_way_bill = ?`
sqlParams = append(sqlParams, localWayBillID)
}
Infos := &model.UserVendorOrder{}