jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
80cbadc7 1 parent aacfc8d8

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

Inline Side-by-side
Showing 2 changed files with 13 additions and 0 deletions
...@@ -4,6 +4,7 @@ import com.infoloop.tianting.annotation.RequestKeyParam; ...@@ -4,6 +4,7 @@ import com.infoloop.tianting.annotation.RequestKeyParam;
4 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType; 4 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
5 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum; 5 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
6 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum; 6 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
7 +import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
7 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum; 8 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
8 import com.infoloop.tianting.model.common.PageInfo; 9 import com.infoloop.tianting.model.common.PageInfo;
9 import io.swagger.annotations.ApiModel; 10 import io.swagger.annotations.ApiModel;
...@@ -499,6 +500,12 @@ public class OrderDbDTO { ...@@ -499,6 +500,12 @@ public class OrderDbDTO {
499 @ApiModelProperty(value = "菜品展示名称") 500 @ApiModelProperty(value = "菜品展示名称")
500 private String showName; 501 private String showName;
501 502
503 + @ApiModelProperty(value = "订单状态")
504 + private OrderStatusEnum status;
505 +
506 + @ApiModelProperty(value = "订单支付状态")
507 + private PayStatusEnum payStatus;
508 +
502 @ApiModelProperty(value = "菜品详情，菜品主料、口味、能量、脂肪、蛋白质、碳水化合物、忌口、医嘱等") 509 @ApiModelProperty(value = "菜品详情，菜品主料、口味、能量、脂肪、蛋白质、碳水化合物、忌口、医嘱等")
503 private MealDetailDto mealDetailJson; 510 private MealDetailDto mealDetailJson;
504 511
......
...@@ -259,6 +259,10 @@ public class OrderServiceImpl implements OrderService { ...@@ -259,6 +259,10 @@ public class OrderServiceImpl implements OrderService {
259 259
260 @Override 260 @Override
261 public List<OrderDetailDto> getOrderDetailsByOrderId(Integer orderId) { 261 public List<OrderDetailDto> getOrderDetailsByOrderId(Integer orderId) {
262 + final var orderById = orderServiceRpcClient.getOrderById(orderId);
263 + if (orderById == null) {
264 + return List.of();
265 + }
262 final var responseList = orderServiceRpcClient.getOrderDetailsByOrderId(orderId); 266 final var responseList = orderServiceRpcClient.getOrderDetailsByOrderId(orderId);
263 return responseList.stream().map(d -> 267 return responseList.stream().map(d ->
264 OrderDetailDto.builder() 268 OrderDetailDto.builder()
...@@ -270,6 +274,8 @@ public class OrderServiceImpl implements OrderService { ...@@ -270,6 +274,8 @@ public class OrderServiceImpl implements OrderService {
270 .orderId(d.getOrderId()) 274 .orderId(d.getOrderId())
271 .price(d.getPrice()) 275 .price(d.getPrice())
272 .showName(d.getShowName()) 276 .showName(d.getShowName())
277 + .status(orderById.getStatus())
278 + .payStatus(orderById.getPayStatus())
273 .mealDetailJson(MealDetailDto.builder() 279 .mealDetailJson(MealDetailDto.builder()
274 .allergies(d.getMealDetailJson().getAllergiesList()) 280 .allergies(d.getMealDetailJson().getAllergiesList())
275 .basicMaterials(d.getMealDetailJson().getBasicMaterials()) 281 .basicMaterials(d.getMealDetailJson().getBasicMaterials())
......