From 29d28691cd638d673f12a7bb5128581ebab3f6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 1 Apr 2022 13:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/dao_order.go         |  4 +++-
 business/partner/delivery/fn/waybill.go | 26 +++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index bd08f5d4d..48a31fcdc 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -853,7 +853,9 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	`
 	if isIncludeSku {
 		sql += `
-		JOIN order_sku t3 ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id`
+		JOIN order_sku t3 ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id 
+		JOIN sku_name tsn ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id
+		`
 	}
 	sqlWhere := " WHERE 1 = 1"
 	var (
diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index 0887141d4..b58a202e1 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -188,17 +188,23 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 
 // 订单状态
 func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
-	order := &model.Waybill{
-		VendorWaybillID:  msg.Param.PartnerOrderCode,
-		VendorWaybillID2: utils.Int64ToStr(msg.Param.OrderId),
-		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,
+
+	cc := &fnpsapi.OrderCallbackParam{}
+	if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
+		fmt.Println("==========err:=", err)
 	}
-	order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.Param.PartnerOrderCode)
+
+	order := &model.Waybill{
+		VendorWaybillID:  cc.PartnerOrderCode,
+		VendorWaybillID2: utils.Int64ToStr(cc.OrderId),
+		WaybillVendorID:  model.VendorIDFengNiao,
+		CourierName:      cc.CarrierDriverName,
+		CourierMobile:    cc.CarrierDriverPhone,
+		VendorStatus:     utils.Int2Str(cc.OrderStatus),
+		StatusTime:       utils.Timestamp2Time(cc.PushTime),
+		Remark:           cc.Description,
+	}
+	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)