sm order

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

@@ -121,8 +121,17 @@ public class OrderController {
         if (order == null) {
             throw new GlobalException("未找到所在的订单");
         }
-        UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
-        order.setUserAddrOrder(userAddrOrder);
+        if (order.getOrderType().equals(4)){
+            UserAddrOrder addrOrder = new UserAddrOrder();
+            addrOrder.setReceiver(order.getConsigneeName());
+            addrOrder.setMobile(order.getConsigneeMobile());
+            addrOrder.setAddress(order.getConsigneeAddress());
+            order.setUserAddrOrder(addrOrder);
+        }else {
+            UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
+            order.setUserAddrOrder(userAddrOrder);
+        }
+
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
         if (!orderItems.isEmpty()) {
             orderItems.forEach(c -> {