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

投诉骑手

Browse Source
This commit is contained in:
苏尹岚
2019-12-25 18:39:13 +08:00
parent 3983e9d5a9
commit 70e2d05549
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/waybill.go
View File

@@ -256,7 +256,7 @@ func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, vendorID, wayb
if err == nil && len(wayBillList) > 0 {
err = p.ComplaintRider(wayBillList[0], complaintID, complaintReasonsMap[complaintID])
} else {
return fmt.Errorf("未查询到到相关订单,订单状态要求必须是完成！订单号：[%v] ,厂商：[%v]", orderID, waybillVendorID)
return fmt.Errorf("未查询到到相关订单,订单状态要求必须是完成！订单号：[%v] ,厂商：[%v]", vendorOrderID, waybillVendorID)
}
return err
}

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

@@ -1032,7 +1032,7 @@ func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int,
sql := `
SELECT b.*
FROM goods_order a
LEFT JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id AND b.vendor_id = a.vendor_id
JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id AND b.vendor_id = a.vendor_id
WHERE a.vendor_order_id = ?
AND a.vendor_id = ?
`