不用补改价

business/jxcallback/orderman/order.go

@@ -1181,9 +1181,33 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 }
 
 func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err error) {
+	db := dao.GetDB()
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJDShop)
+	if order == nil || err != nil {
+		return fmt.Errorf("目前只支持京狗订单创建！")
+	}
+	if order.Status >= model.OrderStatusDelivering {
+		return fmt.Errorf("订单当前状态不支持创建！")
+	}
+	waybill := &model.Waybill{}
+	waybills, err := dao.GetWaybills(db, vendorOrderID)
+	if err != nil {
+		return err
+	}
+	if len(waybills) > 0 {
+		for _, v := range waybills {
+			if v.Status != model.WaybillStatusCanceled {
+				waybill = v
+			}
+		}
+		handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
+		err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
+		if err != nil {
+			return err
+		}
+	}
 	handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]
-	waybill, err := handler.Handler.CreateWaybill(order, 0)
-	jdshop.CurPurchaseHandler.OrderTransfer(ctx, vendorOrderID, waybill.VendorWaybillID, false)
+	waybill2, err := handler.Handler.CreateWaybill(order, 0)
+	jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, waybill2.VendorWaybillID, false)
 	return err
 }