Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
This commit is contained in:
@@ -1,7 +1,12 @@
|
||||
package com.peanut.modules.master.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseToMedicineMarketEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface CourseToMedicineMarketService extends IService<CourseToMedicineMarketEntity> {
|
||||
|
||||
List<CourseToMedicineMarketEntity> getCourseByMarketId(int marketId);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
package com.peanut.modules.master.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseToMedicineMarketEntity;
|
||||
import com.peanut.modules.common.entity.CourseToSociologyMarketEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface CourseToSociologyMarketService extends IService<CourseToSociologyMarketEntity> {
|
||||
|
||||
List<CourseToSociologyMarketEntity> getCourseListByMarketId(int marketId);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.peanut.modules.master.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.SysCourseDirectEntity;
|
||||
import com.peanut.modules.common.to.EditCourseRecordDto;
|
||||
|
||||
public interface SysCourseDirectService extends IService<SysCourseDirectEntity> {
|
||||
|
||||
SysCourseDirectEntity editCourseRecord(EditCourseRecordDto editCourseRecordDto);
|
||||
}
|
||||
@@ -52,8 +52,8 @@ public class CourseMedicineServiceImpl extends ServiceImpl<CourseMedicineDao, Co
|
||||
}
|
||||
}
|
||||
if(old.getIsLast()==1&& courseMedicine.getIsLast()==0){
|
||||
CourseToMedicine courseToSociologyEntity = toMedicalDao.selectOne(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getMedicalId, courseMedicine.getId()));
|
||||
if(courseToSociologyEntity!=null){
|
||||
Integer integer = toMedicalDao.selectCount(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getMedicalId, courseMedicine.getId()));
|
||||
if(integer>0){
|
||||
return R.error(502,"更新失败,请先把此项与课程的关联关系清空后才可把此标签变成普通标签");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,37 @@
|
||||
package com.peanut.modules.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.modules.common.dao.CourseDao;
|
||||
import com.peanut.modules.common.dao.CourseMedicineMarketDao;
|
||||
import com.peanut.modules.common.dao.CourseToMedicineMarketDao;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseToMedicineMarketEntity;
|
||||
import com.peanut.modules.master.service.CourseToMedicineMarketService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service("masterCourseToMarketService")
|
||||
public class CourseToMedicineMarketServiceImpl extends ServiceImpl<CourseToMedicineMarketDao, CourseToMedicineMarketEntity> implements CourseToMedicineMarketService {
|
||||
@Autowired
|
||||
private CourseMedicineMarketDao courseMedicineMarketDao;
|
||||
@Autowired
|
||||
private CourseDao courseDao;
|
||||
|
||||
@Override
|
||||
public List<CourseToMedicineMarketEntity> getCourseByMarketId(int marketId) {
|
||||
List<CourseToMedicineMarketEntity> courseToMedicineMarketEntities = this.getBaseMapper().selectList(new LambdaQueryWrapper<CourseToMedicineMarketEntity>()
|
||||
.eq(CourseToMedicineMarketEntity::getMedicineMarketId, marketId)
|
||||
.orderByAsc(CourseToMedicineMarketEntity::getSort));
|
||||
for (CourseToMedicineMarketEntity c :courseToMedicineMarketEntities){
|
||||
c.setCourseMedicineMarketEntity(courseMedicineMarketDao.selectById(c.getMedicineMarketId()));
|
||||
c.setCourseEntity(courseDao.selectById(c.getCourseId()));
|
||||
}
|
||||
return courseToMedicineMarketEntities;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,40 @@
|
||||
package com.peanut.modules.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.modules.common.dao.CourseDao;
|
||||
import com.peanut.modules.common.dao.CourseSociologyMarketDao;
|
||||
import com.peanut.modules.common.dao.CourseToMedicineMarketDao;
|
||||
import com.peanut.modules.common.dao.CourseToSociologyMarketDao;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseToMedicineMarketEntity;
|
||||
import com.peanut.modules.common.entity.CourseToSociologyMarketEntity;
|
||||
import com.peanut.modules.master.service.CourseToMedicineMarketService;
|
||||
import com.peanut.modules.master.service.CourseToSociologyMarketService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service("masterCourseToSociologyMarketService")
|
||||
public class CourseToSociologyMarketServiceImpl extends ServiceImpl<CourseToSociologyMarketDao, CourseToSociologyMarketEntity> implements CourseToSociologyMarketService {
|
||||
@Autowired
|
||||
private CourseSociologyMarketDao courseSociologyMarketDao;
|
||||
@Autowired
|
||||
private CourseDao courseDao;
|
||||
|
||||
@Override
|
||||
public List<CourseToSociologyMarketEntity> getCourseListByMarketId(int marketId) {
|
||||
List<CourseToSociologyMarketEntity> courseToSociologyMarketEntities = this.getBaseMapper().selectList(new LambdaQueryWrapper<CourseToSociologyMarketEntity>()
|
||||
.eq(CourseToSociologyMarketEntity::getSociologyMarketId, marketId)
|
||||
.orderByAsc(CourseToSociologyMarketEntity::getSort));
|
||||
for (CourseToSociologyMarketEntity c : courseToSociologyMarketEntities){
|
||||
c.setCourseSociologyMarketEntity(courseSociologyMarketDao.selectById(c.getSociologyMarketId()));
|
||||
c.setCourseEntity(courseDao.selectById(c.getCourseId()));
|
||||
}
|
||||
return courseToSociologyMarketEntities;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.peanut.modules.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.common.dao.SysCourseDirectDao;
|
||||
import com.peanut.modules.common.entity.SysCourseDirectEntity;
|
||||
import com.peanut.modules.common.to.EditCourseRecordDto;
|
||||
import com.peanut.modules.master.service.SysCourseDirectService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service("masterSysCourseDirect")
|
||||
public class SysCourseDirectServiceImpl extends ServiceImpl<SysCourseDirectDao, SysCourseDirectEntity> implements SysCourseDirectService {
|
||||
|
||||
@Override
|
||||
public SysCourseDirectEntity editCourseRecord(EditCourseRecordDto editCourseRecordDto) {
|
||||
SysCourseDirectEntity one = this.getOne(new LambdaQueryWrapper<SysCourseDirectEntity>().eq(SysCourseDirectEntity::getType, editCourseRecordDto.getType()));
|
||||
switch (editCourseRecordDto.getRecordType()){
|
||||
case 0:
|
||||
one.setBuyRecord(editCourseRecordDto.getContent());
|
||||
break;
|
||||
case 1:
|
||||
one.setUseRecord(editCourseRecordDto.getContent());
|
||||
break;
|
||||
case 2:
|
||||
one.setStudyRecord(editCourseRecordDto.getContent());
|
||||
break;
|
||||
case 3:
|
||||
one.setVipRecord(editCourseRecordDto.getContent());
|
||||
break;
|
||||
}
|
||||
this.updateById(one);
|
||||
return one;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user