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)