From 6ed799cd3ec7f4ef38dea6747b8b0678fd72f5d1 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 3 Jun 2024 15:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/service/impl/BuyOrderServiceImpl.java       |  6 ++++++
 .../com/peanut/modules/common/entity/BuyOrder.java   |  6 ++++++
 .../modules/medical/controller/CourseController.java |  3 +++
 .../service/CourseCatalogueChapterVideoService.java  |  7 +++++++
 .../impl/CourseCatalogueChapterVideoServiceImpl.java | 12 ++++++++++++
 5 files changed, 34 insertions(+)
 create mode 100644 src/main/java/com/peanut/modules/medical/service/CourseCatalogueChapterVideoService.java
 create mode 100644 src/main/java/com/peanut/modules/medical/service/impl/CourseCatalogueChapterVideoServiceImpl.java

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 f375752a..c5cd71a6 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
@@ -92,6 +92,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private CourseCatalogueDao courseCatalogueDao;
     @Autowired
     private PayZfbOrderService payZfbOrderService;
+    @Autowired
+    private BookBuyConfigDao bookBuyConfigDao;
 
     protected Logger logger = LoggerFactory.getLogger(BuyOrderServiceImpl.class);
 
@@ -481,6 +483,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             }
             b.setProductList(buyOrderProducts);
             b.setTimestamp(b.getCreateTime().getTime()/1000);
+            //充值订单填充充值商品信息
+            if(b.getProductId()!=null&&Integer.valueOf(b.getProductId())>0){
+                b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(Integer.valueOf(b.getProductId())));
+            }
             //获取包裹信息
             List<Integer> collect = buyOrderProductService.list(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()).gt(BuyOrderProduct::getExpressOrderId, 0))
                     .stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
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 ff5c0323..ca251883 100644
--- a/src/main/java/com/peanut/modules/common/entity/BuyOrder.java
+++ b/src/main/java/com/peanut/modules/common/entity/BuyOrder.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.peanut.modules.book.controller.BookBuyConfigController;
 import com.peanut.modules.book.vo.response.ConsigneeVo;
 import lombok.Data;
 
@@ -200,4 +201,9 @@ public class BuyOrder implements Serializable {
 
     @TableField(exist = false)
     private String appName;
+
+    @TableField(exist = false)
+    private BookBuyConfigEntity bookBuyConfigEntity;
+    @TableField(exist = false)
+    private VipBuyConfigEntity vipBuyConfigEntity;
 }
diff --git a/src/main/java/com/peanut/modules/medical/controller/CourseController.java b/src/main/java/com/peanut/modules/medical/controller/CourseController.java
index 4fe0a05c..4d93e80f 100644
--- a/src/main/java/com/peanut/modules/medical/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/medical/controller/CourseController.java
@@ -2,9 +2,11 @@ package com.peanut.modules.medical.controller;
 
 import com.peanut.common.utils.R;
 import com.peanut.common.utils.ShiroUtils;
+import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
 import com.peanut.modules.common.entity.CourseEntity;
 import com.peanut.modules.common.to.ParamTo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,4 +20,5 @@ public class CourseController {
 
 
 
+
 }
diff --git a/src/main/java/com/peanut/modules/medical/service/CourseCatalogueChapterVideoService.java b/src/main/java/com/peanut/modules/medical/service/CourseCatalogueChapterVideoService.java
new file mode 100644
index 00000000..2315e50a
--- /dev/null
+++ b/src/main/java/com/peanut/modules/medical/service/CourseCatalogueChapterVideoService.java
@@ -0,0 +1,7 @@
+package com.peanut.modules.medical.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
+
+public interface CourseCatalogueChapterVideoService extends IService<CourseCatalogueChapterVideoEntity> {
+}
diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseCatalogueChapterVideoServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseCatalogueChapterVideoServiceImpl.java
new file mode 100644
index 00000000..69559b8a
--- /dev/null
+++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseCatalogueChapterVideoServiceImpl.java
@@ -0,0 +1,12 @@
+package com.peanut.modules.medical.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao;
+import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
+import com.peanut.modules.medical.service.CourseCatalogueChapterVideoService;
+import org.springframework.stereotype.Service;
+
+@Service("medicineCourseCatalogueChapterVideoService")
+public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCatalogueChapterVideoDao, CourseCatalogueChapterVideoEntity> implements CourseCatalogueChapterVideoService {
+
+}