From 8136f72674e9528459f612550e2eb977f0a4cd82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 27 Jun 2020 17:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9C=E5=9B=AD=E5=8F=91=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E5=B0=9D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/mtps/waybill.go | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index a602fcfa8..1b283639c 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -61,7 +61,13 @@ func OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.Ca
 }
 
 func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
-	c.pushToGy(msg)
+	vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
+	order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
+	//查不到订单可能就是果园的订单
+	if order == nil {
+		c.pushToGy(msg)
+		return mtpsapi.SuccessResponse
+	}
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onWaybillMsg(msg)
 	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS))
@@ -105,37 +111,31 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 		globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg)
 		return mtpsapi.SuccessResponse
 	}
-	globals.SugarLogger.Debugf("onWaybillMsg test, %v", msg)
 	return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 }
 
 func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {
-	vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
-	order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
-	//查不到订单可能就是果园的订单
-	if order == nil {
-		cl := http.Client{}
-		params := make(map[string]interface{})
-		params["mt_peisong_id"] = msg.MtPeisongID
-		params["courier_name"] = msg.CourierName
-		params["delivery_id"] = msg.DeliveryID
-		params["appkey"] = msg.AppKey
-		params["order_id"] = msg.OrderID
-		params["courier_phone"] = msg.CourierPhone
-		params["status"] = msg.Status
-		params["timestamp"] = msg.Timestamp
-		params["cancel_reason_id"] = msg.CancelReasonId
-		params["cancel_reason"] = msg.CancelReason
-		urls := utils.Map2URLValues(params)
-		sign := signParams(urls)
-		params["sign"] = sign
-		request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
-		if err != nil {
-			return
-		}
-		request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-		cl.Do(request)
+	cl := http.Client{}
+	params := make(map[string]interface{})
+	params["mt_peisong_id"] = msg.MtPeisongID
+	params["courier_name"] = msg.CourierName
+	params["delivery_id"] = msg.DeliveryID
+	params["appkey"] = msg.AppKey
+	params["order_id"] = msg.OrderID
+	params["courier_phone"] = msg.CourierPhone
+	params["status"] = msg.Status
+	params["timestamp"] = msg.Timestamp
+	params["cancel_reason_id"] = msg.CancelReasonId
+	params["cancel_reason"] = msg.CancelReason
+	urls := utils.Map2URLValues(params)
+	sign := signParams(urls)
+	params["sign"] = sign
+	request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
+	if err != nil {
+		return
 	}
+	request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+	cl.Do(request)
 }
 
 func signParams(params url.Values) string {