diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 4295d5ac..e57b8955 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -99,7 +99,7 @@ public class BuyOrderController { * @param requestVo request value object * @return R */ - @RequestMapping(path = "orderList", method = RequestMethod.POST) + @RequestMapping(path = "/orderList", method = RequestMethod.POST) public R orderList(@RequestBody BuyOrderListRequestVo requestVo) { List response = buyOrderService.orderList(requestVo); return R.ok().put("result", response); diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index b2addb5f..ba4e09df 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -309,10 +309,26 @@ public class BuyOrderServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", buyOrder.getOrderId()); List buyOrderProductList = buyOrderProductService.list(queryWrapper); + List goodsResponseVoList = new ArrayList<>(); for (BuyOrderProduct buyOrderProduct : buyOrderProductList) { - buyOrderProduct.getProductId(); + GoodsResponseVo goodsResponseVo = new GoodsResponseVo(); + QueryWrapper shopProductQueryWrapper = new QueryWrapper<>(); + shopProductQueryWrapper.eq("id", buyOrderProduct.getProductId()); + ShopProduct shopProduct = shopProductService.getOne(shopProductQueryWrapper); + goodsResponseVo.setProductName(shopProduct.getProductName()); + goodsResponseVo.setProductImage(shopProduct.getProductImages()); + goodsResponseVo.setProductPrice(shopProduct.getPrice()); + QueryWrapper expressOrderQueryWrapper = new QueryWrapper<>(); + expressOrderQueryWrapper.eq("id", buyOrderProduct.getExpress_order_id()); + ExpressOrder expressOrder = expressOrderService.getOne(expressOrderQueryWrapper); + ExpressResponseVo expressResponseVo = new ExpressResponseVo(); + expressResponseVo.setExpressCompany(expressOrder.getExpressCompanyCode()); + expressResponseVo.setExpressOrderSn(expressOrder.getExpressOrderSn()); + expressResponseVo.setPrintTemplate(expressOrder.getPrintTemplate()); + goodsResponseVo.setExpressInfo(expressResponseVo); + goodsResponseVoList.add(goodsResponseVo); } - responseVo.setGoodsList(); + responseVo.setGoodsList(goodsResponseVoList); requestVo.setIndex((requestVo.getIndex() - 1) * requestVo.getPageSize()); result.add(responseVo); } diff --git a/src/main/java/com/peanut/modules/book/vo/response/GoodsResponseVo.java b/src/main/java/com/peanut/modules/book/vo/response/GoodsResponseVo.java index b6652898..7d6ac48e 100644 --- a/src/main/java/com/peanut/modules/book/vo/response/GoodsResponseVo.java +++ b/src/main/java/com/peanut/modules/book/vo/response/GoodsResponseVo.java @@ -26,5 +26,5 @@ public class GoodsResponseVo { /** * 快递 */ - private ExpressQueryResponseVo expressInfo; + private ExpressResponseVo expressInfo; }