新增mediaType0空1视频2音频

组装充值配置详情

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

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

src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java

@@ -36,6 +36,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private ShopProductDao shopProductDao;
     @Autowired
     private ExpressOrderDao expressOrderDao;
+    @Autowired
+    private BookBuyConfigDao bookBuyConfigDao;
 
     @Override
     public Map<String, Object> initPrepareOrder(PrepareOrderDto prepareOrderDto) {
@@ -78,7 +80,12 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         List<BuyOrder> 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<BuyOrderProduct> buyOrderProducts = buyOrderProductDao.selectList(
                         new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()));
@@ -123,6 +130,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         BuyOrder buyOrder = this.getOne(orderWrapper);
         res.put("buyOrder",buyOrder);
         if (buyOrder!=null){
+            //组装充值配置详情
+            if (buyOrder.getProductId()!=null){
+                buyOrder.setBookBuyConfigEntity(bookBuyConfigDao.selectById(buyOrder.getProductId()));
+            }
             //添加商品信息
             MPJLambdaWrapper<BuyOrderProduct> buyOrderProductWrapper = new MPJLambdaWrapper<>();
             buyOrderProductWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);