From cda9eb9ae7fecac21e4ad132771c31645a364037 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 30 May 2024 14:32:28 +0800
Subject: [PATCH] bug

---
 .../common/entity/CourseCatalogueEntity.java       |  7 +++++++
 .../master/controller/CourseController.java        |  6 ++++++
 .../master/service/CourseCatalogueService.java     |  2 ++
 .../service/impl/CourseCatalogueServiceImpl.java   | 14 ++++++++++++++
 .../master/service/impl/CourseServiceImpl.java     |  8 ++++++++
 5 files changed, 37 insertions(+)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
index ffcf94ea..e8fd14dc 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("course_catalogue")
@@ -48,4 +49,10 @@ public class CourseCatalogueEntity{
      */
     @TableField(exist = false)
     private int completion;
+
+    /**
+     * 存在的商品列表
+     */
+    @TableField(exist = false)
+    private List<ShopProduct> productList;
 }
diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java
index 3ca2f228..2bca723d 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java
@@ -69,6 +69,12 @@ public class CourseController {
         return R.ok().put("catalogues",courseCatalogues);
     }
 
+    @RequestMapping("/createProductForCatalogue")
+    public R createProductForCatalogue(@RequestBody Map<String,Integer> map){
+        int id = map.get("id");
+        return courseCatalogueService.createProductForCatalogue(id);
+    }
+
     @RequestMapping("/addCourseCatalogue")
     public R addCourseCatalogue(@RequestBody CourseCatalogueEntity courseCatalogue){
         courseCatalogueService.addCourseCatalogue(courseCatalogue);
diff --git a/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java b/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java
index 60c2cb10..015605e7 100644
--- a/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java
+++ b/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java
@@ -13,4 +13,6 @@ public interface CourseCatalogueService extends IService<CourseCatalogueEntity>
     R delCourseCatalogue(int id);
 
     void addCourseCatalogue(CourseCatalogueEntity courseCatalogue);
+
+    R createProductForCatalogue(int id);
 }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
index 0017a6b5..a171aa51 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -70,6 +71,19 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
 
     }
 
+    @Override
+    public R createProductForCatalogue(int id) {
+        //check
+        CourseCatalogueEntity byId = this.getById(id);
+        if(byId.getType()!=1){
+            return R.error("普通类型的课程才可以生成商品");
+        }
+        if(byId.getFee().compareTo(BigDecimal.ZERO)==0||byId.getHalfFee().compareTo(BigDecimal.ZERO)==0){
+            return R.error("价格异常");
+        }
+        createProduct(byId);
+        return R.ok();
+    }
 
     private void createProduct(CourseCatalogueEntity courseCatalogue){
         CourseEntity courseEntity = courseDao.selectById(courseCatalogue.getCourseId());
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
index 4fd49b39..619c30b2 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
@@ -74,6 +74,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
         for (CourseEntity c:courseEntityPage.getRecords()){
             List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));
+            for (CourseCatalogueEntity co : courseCatalogueEntities){
+                MPJLambdaWrapper<ShopProductCourseEntity> shopProductCourseEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
+                shopProductCourseEntityMPJLambdaWrapper.selectAll(ShopProduct.class);
+                shopProductCourseEntityMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductCourseEntity::getProductId);
+                shopProductCourseEntityMPJLambdaWrapper.eq(ShopProductCourseEntity::getCatalogueId,co.getId());
+                List<ShopProduct> shopProducts = shopProductCourseDao.selectJoinList(ShopProduct.class, shopProductCourseEntityMPJLambdaWrapper);
+                co.setProductList(shopProducts);
+            }
             c.setCourseCatalogueEntityList(courseCatalogueEntities);
         }
         return courseEntityPage;