- treat DeliveryStatusFailedGetGoods as WaybillStatusFailed for jd waybill

- adjust defsch.

business/partner/delivery/mtps/waybill.go

@@ -126,8 +126,8 @@ func (c *DeliveryHandler) calculateOrderDeliveryFee(order *model.GoodsOrder, bil
 		return 0, 0, ErrStoreNoPriceInfo
 	}
 
-	lng := utils.Str2Float64(lists[0][1].(string))
-	lat := utils.Str2Float64(lists[0][2].(string))
+	lng := utils.Str2Float64(utils.Interface2String(lists[0][1]))
+	lat := utils.Str2Float64(utils.Interface2String(lists[0][2]))
 	if lng == 0 || lat == 0 {
 		globals.SugarLogger.Warnf("calculateDeliveryFee can not calculate delivery fee for orderID:%s, because no coordinate info", order.VendorOrderID)
 		return 0, 0, ErrStoreNoCoordinate
@@ -207,7 +207,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
 							GoodCount: sku.Count,
 							GoodPrice: jxutils.IntPrice2Standard(sku.SalePrice),
 						}
-						goodItem.GoodName, goodItem.GoodUnit = jxutils.SplitSkuName(sku.SkuName)
+						goodItem.GoodName, goodItem.GoodUnit = jxutils.GetNameAndUnitFromSkuName(sku.SkuName)
 						// 好像SKU名不能重复，否则会报错，尝试处理一下
 						if item, ok := goodItemMap[goodItem.GoodName]; !ok {
 							goods.Goods = append(goods.Goods, goodItem)

business/partner/purchase/jd/waybill.go

@@ -38,7 +38,7 @@ func (c *PurchaseHandler) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (re
 		order.Status = model.WaybillStatusDelivering
 	case jdapi.DeliveryStatusFinished:
 		order.Status = model.WaybillStatusDelivered
-	case jdapi.DeliveryStatusFailedDelivery: //, jdapi.DeliveryStatusFailedGetGoods: todo 取货失败不当成投递失败
+	case jdapi.DeliveryStatusFailedDelivery, jdapi.DeliveryStatusFailedGetGoods: // todo 取货失败需不需要当成运单失败？
 		order.Status = model.WaybillStatusFailed
 	default:
 		order.Status = model.WaybillStatusUnknown