From 11df3a4bcd8fc6dd628b7e198ac5b2a44bbb9ef3 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 12 Dec 2024 14:46:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E8=AF=BB=E4=B9=A6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bookAbroad/controller/HomeController.java | 6 ++++++ .../java/com/peanut/modules/common/entity/BuyOrder.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java b/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java index 07fed3e7..020d02cc 100644 --- a/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java @@ -286,7 +286,13 @@ public class HomeController { Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),new LambdaQueryWrapper() .eq(BuyOrder::getUserId,ShiroUtils.getUId()) .eq(BuyOrder::getCome,3) + .eq(BuyOrder::getOrderType,"abroadBook") .eq(BuyOrder::getOrderStatus,"3")); + for (BuyOrder bo:orders.getRecords()){ + if ("abroadBook".equals(bo.getOrderType())){ + bo.setBookEntity(bookService.getById(bo.getAbroadBookId())); + } + } return R.ok().put("orders",orders); } diff --git a/src/main/java/com/peanut/modules/common/entity/BuyOrder.java b/src/main/java/com/peanut/modules/common/entity/BuyOrder.java index 264766bc..7e2383bb 100644 --- a/src/main/java/com/peanut/modules/common/entity/BuyOrder.java +++ b/src/main/java/com/peanut/modules/common/entity/BuyOrder.java @@ -212,4 +212,6 @@ public class BuyOrder implements Serializable { private BookBuyConfigEntity bookBuyConfigEntity; @TableField(exist = false) private VipBuyConfigEntity vipBuyConfigEntity; + @TableField(exist = false) + private BookEntity bookEntity; }