From fe0ed99ab07c79a9b35434766cb843f7adb9f2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 16 May 2022 20:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=9C=82=E9=B8=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/fn/waybill.go | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index 03e561b28..44548e4cc 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -6,7 +6,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"strconv"
 	"strings"
-	"time"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
@@ -201,20 +200,23 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 
 // 订单状态
 func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
+	cc := &fnpsapi.OrderCallbackParam{}
+	if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
+		globals.SugarLogger.Debugf("FNPS  strconv.Atoi fail :[%s]", err)
+		return fnpsapi.Err2CallbackResponse(err, "")
+	}
+
 	order := &model.Waybill{
-		VendorWaybillID:  utils.Int64ToStr(msg.Param.OrderId),
-		VendorWaybillID2: msg.Param.PartnerOrderCode,
+		VendorWaybillID:  utils.Int64ToStr(cc.OrderId),
+		VendorWaybillID2: cc.PartnerOrderCode,
 		WaybillVendorID:  model.VendorIDFengNiao,
-		CourierName:      msg.Param.CarrierDriverName,
-		CourierMobile:    msg.Param.CarrierDriverPhone,
-		VendorStatus:     utils.Int2Str(msg.Param.OrderStatus),
-		StatusTime:       utils.Timestamp2Time(msg.Param.PushTime),
-		Remark:           msg.Param.Description,
+		CourierName:      cc.CarrierDriverName,
+		CourierMobile:    cc.CarrierDriverPhone,
+		VendorStatus:     utils.Int2Str(cc.OrderStatus),
+		StatusTime:       utils.Timestamp2Time(cc.PushTime),
+		Remark:           cc.Description,
 	}
-	if msg.Param.PushTime == 0 {
-		order.StatusTime = time.Now()
-	}
-	order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(utils.Int64ToStr(msg.Param.OrderId))
+	order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode)
 	orderStatus, err := strconv.Atoi(order.VendorStatus)
 	if err != nil {
 		globals.SugarLogger.Debugf("FNPS  strconv.Atoi fail :[%s]", err)