diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index edf63bdb..3679c4f8 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -214,6 +214,39 @@ public class OrderServiceImpl implements OrderService { if (item.getScenicId() != null) { item.setScenicName(scenicNames.get(item.getScenicId())); } + + if (Integer.valueOf(-1).equals(item.getType())) { + item.setGoodsName("一口价"); + item.setOrderType("一口价"); + } else if (Integer.valueOf(0).equals(item.getType())) { + // 单品,查询 + OrderAppRespVO orderAppRespVO = orderMapper.appDetail(item.getId()); + List orderItemList = orderAppRespVO.getOrderItemList(); + if (!orderItemList.isEmpty()) { + if (Integer.valueOf(1).equals(orderItemList.getFirst().getGoodsType())) { + item.setGoodsName("录像集"); + item.setOrderType("录像集"); + } else if (Integer.valueOf(2).equals(orderItemList.getFirst().getGoodsType())) { + item.setGoodsName("照片集"); + item.setOrderType("照片集"); + } else if (Integer.valueOf(0).equals(orderItemList.getFirst().getGoodsType())) { + item.setOrderType("旅行Vlog"); + item.setGoodsName(orderItemList.getFirst().getGoodsName()); + } else if (Integer.valueOf(4).equals(orderItemList.getFirst().getGoodsType())) { + item.setGoodsName("一体机打印"); + item.setOrderType("一体机打印"); + } else { + item.setGoodsName("未知商品"); + item.setOrderType("未知商品"); + } + } + } else if (Integer.valueOf(1).equals(item.getType())) { + item.setGoodsName("多项商品"); + item.setOrderType("打包购买"); + } else if (Integer.valueOf(3).equals(item.getType())) { + item.setGoodsName("打印照片"); + item.setOrderType("照片打印"); + } } PageInfo pageInfo = new PageInfo<>(list); return ApiResponse.success(pageInfo); @@ -237,6 +270,18 @@ public class OrderServiceImpl implements OrderService { if (item.getScenicId() != null) { item.setScenicName(scenicNames.get(item.getScenicId())); } + if (Integer.valueOf(3).equals(item.getType())) { + item.setGoodsName("打印照片"); + if (item.getOrderItemList() != null && !item.getOrderItemList().isEmpty()) { + item.getOrderItemList().getFirst().setGoodsName(item.getGoodsName()); + } + } + if (Integer.valueOf(4).equals(item.getType())) { + item.setGoodsName("一体机打印"); + if (item.getOrderItemList() != null && !item.getOrderItemList().isEmpty()) { + item.getOrderItemList().getFirst().setGoodsName(item.getGoodsName()); + } + } } return ApiResponse.success(list); }