新增课程目录
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.peanut.modules.common.entity;
|
package com.peanut.modules.common.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
@@ -31,4 +32,10 @@ public class CourseCatalogueEntity{
|
|||||||
|
|
||||||
@TableLogic
|
@TableLogic
|
||||||
private Integer delFlag;
|
private Integer delFlag;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否同步创建商品
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Integer needCreate;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ public class ShopProduct implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Integer sumSales;
|
private Integer sumSales;
|
||||||
/**
|
/**
|
||||||
* 商品类型 01: 画册 02:书 04:仪器,03:预售书
|
* 商品类型01挂图02书籍03预售书04仪器05课程06小店商品
|
||||||
*/
|
*/
|
||||||
private String goodsType;
|
private String goodsType;
|
||||||
private String goodsTypeCode;
|
private String goodsTypeCode;
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ public class ShopProductCourseEntity {
|
|||||||
@TableId
|
@TableId
|
||||||
private Integer id;
|
private Integer id;
|
||||||
|
|
||||||
|
private Integer productId;
|
||||||
|
|
||||||
private Integer courseId;
|
private Integer courseId;
|
||||||
|
|
||||||
private Integer catalogueId;
|
private Integer catalogueId;
|
||||||
|
|||||||
@@ -59,9 +59,7 @@ public class CourseController {
|
|||||||
|
|
||||||
@RequestMapping("/addCourseCatalogue")
|
@RequestMapping("/addCourseCatalogue")
|
||||||
public R addCourseCatalogue(@RequestBody CourseCatalogueEntity courseCatalogue){
|
public R addCourseCatalogue(@RequestBody CourseCatalogueEntity courseCatalogue){
|
||||||
|
courseCatalogueService.addCourseCatalogue(courseCatalogue);
|
||||||
//课程这里增加对应商品的还没有做
|
|
||||||
courseCatalogueService.save(courseCatalogue);
|
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,4 +11,6 @@ public interface CourseCatalogueService extends IService<CourseCatalogueEntity>
|
|||||||
List<CourseCatalogueEntity> getCourseCatalogues(int id);
|
List<CourseCatalogueEntity> getCourseCatalogues(int id);
|
||||||
|
|
||||||
R delCourseCatalogue(int id);
|
R delCourseCatalogue(int id);
|
||||||
|
|
||||||
|
void addCourseCatalogue(CourseCatalogueEntity courseCatalogue);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,14 +3,8 @@ package com.peanut.modules.master.service.impl;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.peanut.common.utils.R;
|
import com.peanut.common.utils.R;
|
||||||
import com.peanut.modules.common.dao.CourseCatalogueChapterDao;
|
import com.peanut.modules.common.dao.*;
|
||||||
import com.peanut.modules.common.dao.CourseCatalogueDao;
|
import com.peanut.modules.common.entity.*;
|
||||||
import com.peanut.modules.common.dao.ShopProductCourseDao;
|
|
||||||
import com.peanut.modules.common.dao.UserToCourseDao;
|
|
||||||
import com.peanut.modules.common.entity.CourseCatalogueChapterEntity;
|
|
||||||
import com.peanut.modules.common.entity.CourseCatalogueEntity;
|
|
||||||
import com.peanut.modules.common.entity.ShopProductCourseEntity;
|
|
||||||
import com.peanut.modules.common.entity.UserToCourseEntity;
|
|
||||||
import com.peanut.modules.master.service.CourseCatalogueService;
|
import com.peanut.modules.master.service.CourseCatalogueService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -28,6 +22,11 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
|
|||||||
private UserToCourseDao userToCourseDao;
|
private UserToCourseDao userToCourseDao;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ShopProductCourseDao shopProductCourseDao;
|
private ShopProductCourseDao shopProductCourseDao;
|
||||||
|
@Autowired
|
||||||
|
private ShopProductDao shopProductDao;
|
||||||
|
@Autowired
|
||||||
|
private CourseDao courseDao;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CourseCatalogueEntity> getCourseCatalogues(int id) {
|
public List<CourseCatalogueEntity> getCourseCatalogues(int id) {
|
||||||
@@ -59,4 +58,50 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
|
|||||||
this.removeById(id);
|
this.removeById(id);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addCourseCatalogue(CourseCatalogueEntity courseCatalogue) {
|
||||||
|
this.save(courseCatalogue);
|
||||||
|
if(courseCatalogue.getNeedCreate()==1){
|
||||||
|
this.createProduct(courseCatalogue);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void createProduct(CourseCatalogueEntity courseCatalogue){
|
||||||
|
CourseEntity courseEntity = courseDao.selectById(courseCatalogue.getCourseId());
|
||||||
|
|
||||||
|
//添加半年期商品
|
||||||
|
ShopProduct shopProduct = new ShopProduct();
|
||||||
|
shopProduct.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(半年)");
|
||||||
|
shopProduct.setPrice(courseCatalogue.getHalfFee());
|
||||||
|
shopProduct.setGoodsType("05");
|
||||||
|
shopProductDao.insert(shopProduct);
|
||||||
|
//添加半年期的商品课程对应关系
|
||||||
|
ShopProductCourseEntity shopProductCourseEntity = new ShopProductCourseEntity();
|
||||||
|
shopProductCourseEntity.setProductId(shopProduct.getProductId());
|
||||||
|
shopProductCourseEntity.setCourseId(courseCatalogue.getCourseId());
|
||||||
|
shopProductCourseEntity.setCatalogueId(courseCatalogue.getId());
|
||||||
|
shopProductCourseEntity.setDays(180);
|
||||||
|
shopProductCourseDao.insert(shopProductCourseEntity);
|
||||||
|
|
||||||
|
//添加一年期商品
|
||||||
|
ShopProduct shopProduct1 = new ShopProduct();
|
||||||
|
shopProduct1.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(一年)");
|
||||||
|
shopProduct1.setPrice(courseCatalogue.getFee());
|
||||||
|
shopProduct1.setGoodsType("05");
|
||||||
|
shopProductDao.insert(shopProduct1);
|
||||||
|
//添加一年期的商品课程对应关系
|
||||||
|
ShopProductCourseEntity shopProductCourseEntity1 = new ShopProductCourseEntity();
|
||||||
|
shopProductCourseEntity1.setProductId(shopProduct1.getProductId());
|
||||||
|
shopProductCourseEntity1.setCourseId(courseCatalogue.getCourseId());
|
||||||
|
shopProductCourseEntity1.setCatalogueId(courseCatalogue.getId());
|
||||||
|
shopProductCourseEntity1.setDays(365);
|
||||||
|
shopProductCourseDao.insert(shopProductCourseEntity1);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user