fix

yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java

@@ -53,7 +53,8 @@ import java.util.List;
 import java.util.Objects;
 
 @RestController
-@RequestMapping("/p/myOrder")
+//@RequestMapping("/p/myOrder")
+@RequestMapping("/myOrder")
 @Api(tags = "我的订单接口")
 @AllArgsConstructor
 public class MyOrderController {
@@ -121,8 +122,8 @@ public class MyOrderController {
     @ApiOperation(value = "订单详情信息", notes = "根据订单号获取订单详情信息")
     @ApiImplicitParam(name = "orderNumber", value = "订单号", required = true, dataType = "String")
     public ResponseEntity<OrderShopDto> orderDetail(@RequestParam(value = "orderNumber", required = true) String orderNumber) {
-        String userId = SecurityUtils.getUser().getUserId();
-//        String userId = "1";
+//        String userId = SecurityUtils.getUser().getUserId();
+        String userId = "36726893042d492aba446439c5f00584";
         OrderShopDto orderShopDto = new OrderShopDto();
 
         Order order = orderService.getOrderByOrderNumberAndUserId(orderNumber, userId, true);
@@ -242,7 +243,11 @@ public class MyOrderController {
         orderShopDto.setTotal(total);
         orderShopDto.setTotalNum(totalNum);
         orderShopDto.setCommSts(order.getCommSts());
-
+        orderShopDto.setDvyFlowId(order.getDvyFlowId());
+        Delivery delivery = deliveryService.getById(order.getDvyId());
+        if (delivery!=null){
+            orderShopDto.setDvyName(delivery.getDvyName());
+        }
         return ResponseEntity.ok(orderShopDto);
     }
 

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java

@@ -113,6 +113,12 @@ public class OrderShopDto implements Serializable {
     @ApiModelProperty(value = "配送类型 1:快递 2:自提 3：无需快递", required = true)
     private Integer dvyType;
 
+    @ApiModelProperty(value = "物流单号", required = true)
+    private String dvyFlowId;
+
+    @ApiModelProperty(value = "物流公司名称", required = true)
+    private String dvyName;
+
     /**
      * 订单类型1团购订单 2秒杀订单
      */