From d2644135e79ba64112cea47c2b9ea1febecc5965 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 5 Jun 2024 17:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EmediaType0=E7=A9=BA1=E8=A7=86?= =?UTF-8?q?=E9=A2=912=E9=9F=B3=E9=A2=91=20=E7=BB=84=E8=A3=85=E5=85=85?= =?UTF-8?q?=E5=80=BC=E9=85=8D=E7=BD=AE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peanut/modules/common/entity/CourseMedicine.java | 3 +++ .../modules/common/entity/CourseSociologyEntity.java | 3 +++ .../common/service/impl/BuyOrderServiceImpl.java | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java index db16ad8a..ddd542f2 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java @@ -29,6 +29,9 @@ public class CourseMedicine { private String media; + //0空1视频2音频 + private Integer mediaType; + private Date createTime; @TableLogic diff --git a/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java index 86ef027b..63314cbd 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java @@ -28,6 +28,9 @@ public class CourseSociologyEntity { private String media; + //0空1视频2音频 + private Integer mediaType; + private Date createTime; @TableLogic diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java index a0882c25..5c6b12bf 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java @@ -36,6 +36,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl private ShopProductDao shopProductDao; @Autowired private ExpressOrderDao expressOrderDao; + @Autowired + private BookBuyConfigDao bookBuyConfigDao; @Override public Map initPrepareOrder(PrepareOrderDto prepareOrderDto) { @@ -78,7 +80,12 @@ public class BuyOrderServiceImpl extends ServiceImpl impl List buyOrderList = page.getRecords(); if (buyOrderList.size() > 0){ for(BuyOrder b : buyOrderList){ + //组装购买人 b.setUser(userDao.selectById(b.getUserId())); + //组装充值配置详情 + if (b.getProductId()!=null){ + b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(b.getProductId())); + } //组装商品 List buyOrderProducts = buyOrderProductDao.selectList( new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, b.getOrderId())); @@ -123,6 +130,10 @@ public class BuyOrderServiceImpl extends ServiceImpl impl BuyOrder buyOrder = this.getOne(orderWrapper); res.put("buyOrder",buyOrder); if (buyOrder!=null){ + //组装充值配置详情 + if (buyOrder.getProductId()!=null){ + buyOrder.setBookBuyConfigEntity(bookBuyConfigDao.selectById(buyOrder.getProductId())); + } //添加商品信息 MPJLambdaWrapper buyOrderProductWrapper = new MPJLambdaWrapper<>(); buyOrderProductWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);