From 452a246875f47c04367fabb0a89f4c4bc84f0d57 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 9 May 2024 18:08:37 +0800
Subject: [PATCH] bug

---
 .../com/peanut/modules/common/vo/CourseCatalogueVo.java   | 2 ++
 .../modules/master/controller/ShopProductController.java  | 6 ++++++
 .../peanut/modules/master/service/ShopProductService.java | 7 +++----
 .../master/service/impl/ShopProductServiceImpl.java       | 6 ++++++
 src/main/resources/mapper/master/CourseCatalogueDao.xml   | 8 ++++----
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/vo/CourseCatalogueVo.java b/src/main/java/com/peanut/modules/common/vo/CourseCatalogueVo.java
index e70a4e2b..a51f914f 100644
--- a/src/main/java/com/peanut/modules/common/vo/CourseCatalogueVo.java
+++ b/src/main/java/com/peanut/modules/common/vo/CourseCatalogueVo.java
@@ -14,4 +14,6 @@ public class CourseCatalogueVo {
     private String CourseCatalogueTitle;
 
     private String image;
+
+    private Integer days;
 }
diff --git a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
index ffc9a940..425cfbc9 100644
--- a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
+++ b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
@@ -5,6 +5,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.BookEntity;
 import com.peanut.modules.common.entity.ShopProduct;
+import com.peanut.modules.common.entity.ShopProductCourseEntity;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.common.vo.CourseCatalogueVo;
 import com.peanut.modules.master.service.ShopProductService;
@@ -182,6 +183,11 @@ public class ShopProductController {
         return R.ok().put("page",canBindProductAndCourse);
     }
 
+    @RequestMapping("/bindProductAndCourse")
+    public R bindProductAndCourse(@RequestBody ShopProductCourseEntity shopProductCourseEntity){
+        shopProductService.bindProductAndCourse(shopProductCourseEntity);
+        return null;
+    }
 
 
 
diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductService.java b/src/main/java/com/peanut/modules/master/service/ShopProductService.java
index 66a3e81e..eb852559 100644
--- a/src/main/java/com/peanut/modules/master/service/ShopProductService.java
+++ b/src/main/java/com/peanut/modules/master/service/ShopProductService.java
@@ -3,10 +3,7 @@ package com.peanut.modules.master.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.entity.BookEntity;
-import com.peanut.modules.common.entity.CourseCatalogueEntity;
-import com.peanut.modules.common.entity.CourseEntity;
-import com.peanut.modules.common.entity.ShopProduct;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.common.vo.CourseCatalogueVo;
 
@@ -55,4 +52,6 @@ public interface ShopProductService extends IService<ShopProduct> {
     List<CourseCatalogueVo> getHasBindProductAndCourse(int productId);
 
     Map<String, Object> getCanBindProductAndCourse(ParamTo param);
+
+    void bindProductAndCourse(ShopProductCourseEntity shopProductCourseEntity);
 }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java
index 66e6e96b..6926e334 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java
@@ -233,6 +233,7 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
         wrapper.select(CourseEntity::getImage);
         wrapper.selectAs(CourseEntity::getId,"courseId");
         wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
+        wrapper.select(ShopProductCourseEntity::getDays);
         wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getId,ShopProductCourseEntity::getCatalogueId);
         wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,ShopProductCourseEntity::getCourseId);
         wrapper.eq(ShopProductCourseEntity::getProductId,productId);
@@ -255,6 +256,11 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
         return flag;
     }
 
+    @Override
+    public void bindProductAndCourse(ShopProductCourseEntity shopProductCourseEntity) {
+
+    }
+
     @Override
     public Map<String, Object> getProductToLabel(Integer productId) {
         HashMap<String, Object> flag = new HashMap<>();
diff --git a/src/main/resources/mapper/master/CourseCatalogueDao.xml b/src/main/resources/mapper/master/CourseCatalogueDao.xml
index f07fc947..0ab4c29c 100644
--- a/src/main/resources/mapper/master/CourseCatalogueDao.xml
+++ b/src/main/resources/mapper/master/CourseCatalogueDao.xml
@@ -4,10 +4,10 @@
 <mapper namespace="com.peanut.modules.common.dao.CourseCatalogueDao">
     <select id="getCanBindProductAndCourse" resultType="com.peanut.modules.common.vo.CourseCatalogueVo">
         select
-            t1.id as courseId,
-            t2.id as courseCatalogueId,
-            t1.title as courseTitle,
-            t2.title as CourseCatalogueTitle,
+            t2.id as courseId,
+            t1.id as catalogueId,
+            t2.title as courseTitle,
+            t1.title as CourseCatalogueTitle,
             t2.image
         from course_catalogue t1
         left join course t2 on t1.course_id = t2.id