diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java index bbd2daa..3ab1e1d 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -23,6 +23,7 @@ public class OrderReqQuery extends BaseQueryParameterReq { private Long memberId; @ApiModelProperty("用户昵称") private String memberNickname; + private String memberUid; @ApiModelProperty("用户真实名称") private String memberRealName; /** diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java index eb9f669..deae348 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java @@ -22,8 +22,11 @@ public class OrderRespVO { private Long faceId; private String faceUrl; private Integer type; + private String orderType; + private String goodsName; @ApiModelProperty("用户昵称") private String memberNickname; + private String memberUid; @ApiModelProperty("用户真实名称") private String memberRealName; /** 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 648a776..b4c2093 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 @@ -94,6 +94,31 @@ public class OrderServiceImpl implements OrderService { public ApiResponse> pageQuery(OrderReqQuery query) { PageHelper.startPage(query.getPageNum(), query.getPageSize()); List list = orderMapper.list(query); + list.forEach(item -> { + 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.get(0).getGoodsType())) { + item.setGoodsName("录像集"); + item.setOrderType("录像集"); + } else if (Integer.valueOf(2).equals(orderItemList.get(0).getGoodsType())) { + item.setGoodsName("照片集"); + item.setOrderType("照片集"); + } else if (Integer.valueOf(0).equals(orderItemList.get(0).getGoodsType())) { + item.setOrderType("旅行Vlog"); + item.setGoodsName(orderItemList.get(0).getGoodsName()); + } else { + item.setGoodsName("未知商品"); + item.setOrderType("未知商品"); + } + } + } + }); PageInfo pageInfo = new PageInfo<>(list); return ApiResponse.success(pageInfo); } diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index b75cd8f..4617833 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -7,6 +7,7 @@ + @@ -30,6 +31,7 @@ + @@ -227,7 +229,7 @@ delete from `order` where id = #{id}