add deliver

yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java

@@ -33,10 +33,6 @@ public class DeliveryOrderParam {
 	@ApiModelProperty(value = "物流单号",required=true)
 	private String dvyFlowId;
 
-    @NotBlank(message="物流公司编号不能为空")
-    @ApiModelProperty(value = "物流公司编号",required=true)
-    private String dvyNo;
-
     @NotBlank(message="配送类型 1:快递 2:自提 3：及时配送")
     @ApiModelProperty(value = "配送类型 1:快递 2:自提 3：及时配送",required=true)
     private Integer dvyType;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -14,10 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.enums.DvyType;
 import com.yami.shop.bean.enums.OrderStatus;
-import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderItem;
-import com.yami.shop.bean.model.User;
-import com.yami.shop.bean.model.UserAddrOrder;
+import com.yami.shop.bean.model.*;
 import com.yami.shop.bean.param.BackendOrderParam;
 import com.yami.shop.bean.param.DeliveryOrderParam;
 import com.yami.shop.bean.param.OrderParam;
@@ -59,6 +56,7 @@ public class OrderController {
     private final ProductService productService;
     private final SkuService skuService;
     private final UserService userService;
+    private final DeliveryService deliveryService;
 
 
     /**
@@ -154,6 +152,7 @@ public class OrderController {
                     CullenUtils.validateDataThrowException(orderItemService.refundIngCount(orderItem.getOrderItemId())!=0,"该订单存在售后中商品，请处理后发货..."));
         }
 
+        //Delivery delivery = deliveryService.getById(deliveryOrderParam.getDvyId());
         Order orderParam = new Order();
         if (deliveryOrderParam.getDvyType().equals(2)){
             orderParam.setOrderId(order.getOrderId());