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

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

Browse Source
This commit is contained in:
邹宗楠
2022-07-27 18:13:53 +08:00
parent 6ce9c708dc 7036c87d09
commit cb72da4031
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/model/dao/dao_order.go
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) { func SetOrderStatus(db *DaoDB, orderID string, status int) (msg string, err error) {
sqlParams := []interface{}{} sqlParams := []interface{}{}
sql := `UPDATE order SET status = ? ` sql := `UPDATE order o SET o.status = ? `
if status > 0 { if status > 0 {
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
} }
if orderID != "" { if orderID != "" {
sql += `WHERE order_id = ?` sql += `WHERE o.order_id = ?`
sqlParams = append(sqlParams, orderID) sqlParams = append(sqlParams, orderID)
} }
orderInfos := &model.Order{} 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) { func SetUserVendorOrderStatus(db *DaoDB, localWayBillID string, status int) (msg string, err error) {
sqlParams := []interface{}{} sqlParams := []interface{}{}
sql := `UPDATE user_vendor_order SET order_status = ?` sql := `UPDATE user_vendor_order a SET a.order_status = ?`
if status > 0 { if status > 0 {
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
} }
if localWayBillID != "" { if localWayBillID != "" {
sql += `AND WHERE local_way_bill = ?` sql += `WHERE a.local_way_bill = ?`
sqlParams = append(sqlParams, localWayBillID) sqlParams = append(sqlParams, localWayBillID)
} }
Infos := &model.UserVendorOrder{} Infos := &model.UserVendorOrder{}