课程目录迁移

充值记录列表添加vip详细信息

src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java

@@ -1,11 +1,13 @@
 package com.peanut.modules.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("course_catalogue_chapter")
@@ -31,4 +33,7 @@ public class CourseCatalogueChapterEntity {
 
     @TableLogic
     private Integer delFlag;
+    //视频列表
+    @TableField(exist = false)
+    private List<CourseCatalogueChapterVideoEntity> videoList;
 }

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

@@ -38,6 +38,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private ExpressOrderDao expressOrderDao;
     @Autowired
     private BookBuyConfigDao bookBuyConfigDao;
+    @Autowired
+    private VipBuyConfigDao vipBuyConfigDao;
 
     @Override
     public Map<String, Object> initPrepareOrder(PrepareOrderDto prepareOrderDto) {
@@ -86,6 +88,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                 if (b.getProductId()!=null){
                     b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(b.getProductId()));
                 }
+                if (b.getVipBuyConfigId()!=0){
+                    b.setVipBuyConfigEntity(vipBuyConfigDao.selectById(b.getVipBuyConfigId()));
+                }
                 //组装商品
                 List<BuyOrderProduct> buyOrderProducts = buyOrderProductDao.selectList(
                         new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()));