From 3983e9d5a9d7015872f64b69168afe594a2ec141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 25 Dec 2019 18:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E9=AA=91=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/waybill.go |  6 +++---
 business/model/dao/dao_order.go         | 10 +++++++---
 controllers/jx_order.go                 |  7 ++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go
index 2171dd444..32367df39 100644
--- a/business/jxcallback/orderman/waybill.go
+++ b/business/jxcallback/orderman/waybill.go
@@ -249,14 +249,14 @@ func GetComplaintReasons() (complaintReasonList []*dadaapi.ComplaintReason) {
 	return complaintReasonList
 }
 
-func ComplaintRider(ctx *jxcontext.Context, orderID string, vendorID, complaintID int) (err error) {
+func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, vendorID, waybillVendorID, complaintID int) (err error) {
 	db := dao.GetDB()
 	p := partner.GetDeliveryPlatformFromVendorID(vendorID).Handler
-	wayBillList, err := dao.GetWayBillByOrderID(db, model.OrderStatusFinished, vendorID, orderID)
+	wayBillList, err := dao.GetWayBillByOrderID(db, model.OrderStatusFinished, vendorID, waybillVendorID, vendorOrderID)
 	if err == nil && len(wayBillList) > 0 {
 		err = p.ComplaintRider(wayBillList[0], complaintID, complaintReasonsMap[complaintID])
 	} else {
-		return fmt.Errorf("未查询到到相关订单,订单状态要求必须是完成！订单号：[%v] ,厂商：[%v]", orderID, vendorID)
+		return fmt.Errorf("未查询到到相关订单,订单状态要求必须是完成！订单号：[%v] ,厂商：[%v]", orderID, waybillVendorID)
 	}
 	return err
 }
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 8acf4cf02..e62c062d6 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1028,14 +1028,18 @@ func LoadPendingOrders(db *DaoDB, orderCreatedAfter time.Time, beforStatus int)
 	return orderList, err
 }
 
-func GetWayBillByOrderID(db *DaoDB, orderStatus, waybillVendorID int, vendorOrderID string) (wayBillList []*model.Waybill, err error) {
+func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int, vendorOrderID string) (wayBillList []*model.Waybill, err error) {
 	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
+		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
 		WHERE a.vendor_order_id = ?
+		AND a.vendor_id = ?
 	`
-	sqlParams := []interface{}{vendorOrderID}
+	sqlParams := []interface{}{
+		vendorOrderID,
+		vendorID,
+	}
 	if orderStatus > 0 {
 		sql += ` AND a.status = ?`
 		sqlParams = append(sqlParams, orderStatus)
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 1ee893884..5dbc82735 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -892,15 +892,16 @@ func (c *OrderController) GetComplaintReasons() {
 // @Title 投诉骑手(三方运送)
 // @Description 投诉骑手(三方运送)
 // @Param	token			header		string	true	"认证token"
-// @Param	orderID			formData	string	true	"订单号"
-// @Param	vendorID		formData	int		true	"平台厂商ID"
+// @Param	vendorOrderID	formData	string	true	"订单ID"
+// @Param	vendorID		formData	int		true	"订单所属厂商ID"
+// @Param	waybillVendorID	formData	int		true	"运单所属厂商ID"
 // @Param	complaintID		formData	int		true	"投诉原因ID"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /ComplaintRider [post]
 func (c *OrderController) ComplaintRider() {
 	c.callComplaintRider(func(params *tOrderComplaintRiderParams) (retVal interface{}, errCode string, err error) {
-		err = orderman.ComplaintRider(params.Ctx, params.OrderID,params.VendorID, params.ComplaintID)
+		err = orderman.ComplaintRider(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID)
 		return retVal, "", err
 	})
 }