查询订单详情返回订单状态

@@ -4,6 +4,7 @@ import com.infoloop.tianting.annotation.RequestKeyParam;
 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
+import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
 import com.infoloop.tianting.model.common.PageInfo;
 import io.swagger.annotations.ApiModel;
@@ -499,6 +500,12 @@ public class OrderDbDTO {
     @ApiModelProperty(value = "菜品展示名称")
     private String showName;
 
+    @ApiModelProperty(value = "订单状态")
+    private OrderStatusEnum status;
+
+    @ApiModelProperty(value = "订单支付状态")
+    private PayStatusEnum payStatus;
+
     @ApiModelProperty(value = "菜品详情，菜品主料、口味、能量、脂肪、蛋白质、碳水化合物、忌口、医嘱等")
     private MealDetailDto mealDetailJson;
 

@@ -259,6 +259,10 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public List<OrderDetailDto> getOrderDetailsByOrderId(Integer orderId) {
+        final var orderById = orderServiceRpcClient.getOrderById(orderId);
+        if (orderById == null) {
+            return List.of();
+        }
         final var responseList = orderServiceRpcClient.getOrderDetailsByOrderId(orderId);
         return responseList.stream().map(d ->
                 OrderDetailDto.builder()
@@ -270,6 +274,8 @@ public class OrderServiceImpl implements OrderService {
                         .orderId(d.getOrderId())
                         .price(d.getPrice())
                         .showName(d.getShowName())
+                        .status(orderById.getStatus())
+                        .payStatus(orderById.getPayStatus())
                         .mealDetailJson(MealDetailDto.builder()
                                 .allergies(d.getMealDetailJson().getAllergiesList())
                                 .basicMaterials(d.getMealDetailJson().getBasicMaterials())