订单转移修改

business/jxcallback/orderman/order.go

@@ -1212,11 +1212,13 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 				waybill = v
 			}
 		}
-		if waybill.WaybillVendorID != model.VendorIDJDWL {
-			handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
-			err = handler.Handler.CancelWaybill(waybill, 0, "订单转移被取消")
-			if err != nil {
-				return "", err
+		if waybill != nil {
+			if waybill.WaybillVendorID != model.VendorIDJDWL {
+				handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
+				err = handler.Handler.CancelWaybill(waybill, 0, "订单转移被取消")
+				if err != nil {
+					return "", err
+				}
 			}
 		}
 	}

business/partner/purchase/jdshop/store_sku.go

@@ -24,6 +24,7 @@ import (
 
 const (
 	deleteErr1 = "已经删除的不能直接下架"
+	deleteErr2 = "SKU不存在"
 )
 
 var (