更改
This commit is contained in:
parent
2222d0430c
commit
52579188bf
@ -6,9 +6,9 @@ import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseDeductService;
|
|||||||
import cn.iocoder.yudao.module.base.vo.DriveSchoolCourseDeductVO;
|
import cn.iocoder.yudao.module.base.vo.DriveSchoolCourseDeductVO;
|
||||||
import com.github.pagehelper.Page;
|
import com.github.pagehelper.Page;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import java.util.List;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/base/drive-school-course-deduct")
|
@RequestMapping("/base/drive-school-course-deduct")
|
||||||
@ -25,10 +25,23 @@ public class DlDriveSchoolCourseDeductController {
|
|||||||
* @param pageSize 每页条数
|
* @param pageSize 每页条数
|
||||||
* @return @class DriveSchoolCourseDeductVO
|
* @return @class DriveSchoolCourseDeductVO
|
||||||
*/
|
*/
|
||||||
|
@GetMapping("/page")
|
||||||
public CommonResult<?> page(DriveSchoolCourseDeductVO request,
|
public CommonResult<?> page(DriveSchoolCourseDeductVO request,
|
||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
||||||
Page<DriveSchoolCourseDeductVO> page = new Page<>(pageNo, pageSize);
|
Page<DriveSchoolCourseDeductVO> page = new Page<>(pageNo, pageSize);
|
||||||
return CommonResult.success(driveSchoolCourseDeductService.queryPage(page, request));
|
return CommonResult.success(driveSchoolCourseDeductService.queryPage(page, request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增
|
||||||
|
*
|
||||||
|
* @param list @class DriveSchoolCourseDeductVO
|
||||||
|
* @return id
|
||||||
|
*/
|
||||||
|
@PostMapping
|
||||||
|
public CommonResult<?> add(List<DriveSchoolCourseDeductVO> list) {
|
||||||
|
driveSchoolCourseDeductService.add(list);
|
||||||
|
return CommonResult.ok();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.github.pagehelper.Page;
|
import com.github.pagehelper.Page;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提成配置Service接口
|
* 提成配置Service接口
|
||||||
*
|
*
|
||||||
@ -23,4 +25,19 @@ public interface DlDriveSchoolCourseDeductService extends IService<DriveSchoolCo
|
|||||||
* @return 分页结果
|
* @return 分页结果
|
||||||
*/
|
*/
|
||||||
IPage<DriveSchoolCourseDeductVO> queryPage(Page<DriveSchoolCourseDeductVO> page, DriveSchoolCourseDeductVO request);
|
IPage<DriveSchoolCourseDeductVO> queryPage(Page<DriveSchoolCourseDeductVO> page, DriveSchoolCourseDeductVO request);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增提成配置
|
||||||
|
*
|
||||||
|
* @param list 新增参数
|
||||||
|
* @return 新增结果
|
||||||
|
*/
|
||||||
|
void add(List<DriveSchoolCourseDeductVO> list);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增默认提成配置
|
||||||
|
*
|
||||||
|
* @param courseId 课程id
|
||||||
|
*/
|
||||||
|
void defaultAdd(String courseId);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package cn.iocoder.yudao.module.base.service.impl;
|
package cn.iocoder.yudao.module.base.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
import cn.iocoder.yudao.module.base.entity.DriveSchoolCourseDeduct;
|
import cn.iocoder.yudao.module.base.entity.DriveSchoolCourseDeduct;
|
||||||
import cn.iocoder.yudao.module.base.mapper.DriveSchoolCourseDeductMapper;
|
import cn.iocoder.yudao.module.base.mapper.DriveSchoolCourseDeductMapper;
|
||||||
@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.github.pagehelper.Page;
|
import com.github.pagehelper.Page;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -27,10 +29,11 @@ import java.util.List;
|
|||||||
* @date 2024-05-07
|
* @date 2024-05-07
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl<DriveSchoolCourseDeductMapper, DriveSchoolCourseDeduct> implements DlDriveSchoolCourseDeductService
|
@RequiredArgsConstructor
|
||||||
{
|
public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl<DriveSchoolCourseDeductMapper, DriveSchoolCourseDeduct> implements DlDriveSchoolCourseDeductService {
|
||||||
@Resource
|
private final AdminUserApi userApi;
|
||||||
private AdminUserApi userApi;
|
|
||||||
|
private final IDriveSchoolDeductService deductService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询提成配置
|
* 分页查询提成配置
|
||||||
@ -43,4 +46,32 @@ public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl<DriveSchoo
|
|||||||
public IPage<DriveSchoolCourseDeductVO> queryPage(Page<DriveSchoolCourseDeductVO> page, DriveSchoolCourseDeductVO request) {
|
public IPage<DriveSchoolCourseDeductVO> queryPage(Page<DriveSchoolCourseDeductVO> page, DriveSchoolCourseDeductVO request) {
|
||||||
return baseMapper.queryPage(page, request);
|
return baseMapper.queryPage(page, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增提成配置
|
||||||
|
*
|
||||||
|
* @param list 新增参数
|
||||||
|
* @return 新增结果
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void add(List<DriveSchoolCourseDeductVO> list) {
|
||||||
|
List<DriveSchoolCourseDeduct> driveSchoolCourseDeducts = BeanUtil.copyToList(list, DriveSchoolCourseDeduct.class);
|
||||||
|
saveBatch(driveSchoolCourseDeducts);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增默认提成配置
|
||||||
|
*
|
||||||
|
* @param courseId 课程id
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void defaultAdd(String courseId) {
|
||||||
|
//查询默认提成配置
|
||||||
|
List<DriveSchoolDeduct> defaultDeduct = deductService.list();
|
||||||
|
if (CollectionUtils.isNotEmpty(defaultDeduct)) {
|
||||||
|
List<DriveSchoolCourseDeduct> driveSchoolCourseDeducts = BeanUtil.copyToList(defaultDeduct, DriveSchoolCourseDeduct.class);
|
||||||
|
driveSchoolCourseDeducts.stream().map(driveSchoolCourseDeduct -> driveSchoolCourseDeduct.setCourseId(courseId));
|
||||||
|
saveBatch(driveSchoolCourseDeducts);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse;
|
|||||||
import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCourse;
|
import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCourse;
|
||||||
import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCourseMapper;
|
import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCourseMapper;
|
||||||
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService;
|
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService;
|
||||||
|
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseDeductService;
|
||||||
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseService;
|
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseService;
|
||||||
import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachVO;
|
import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachVO;
|
||||||
import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO;
|
import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO;
|
||||||
@ -37,6 +38,8 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl<DlDriveSchoolCou
|
|||||||
private DlDriveSchoolCourseMapper courseMapper;
|
private DlDriveSchoolCourseMapper courseMapper;
|
||||||
@Resource
|
@Resource
|
||||||
private DlDriveSchoolCoachCourseService coachCourseService;
|
private DlDriveSchoolCoachCourseService coachCourseService;
|
||||||
|
@Resource
|
||||||
|
private DlDriveSchoolCourseDeductService driveSchoolCourseDeductService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询驾校课程
|
* 分页查询驾校课程
|
||||||
@ -87,6 +90,8 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl<DlDriveSchoolCou
|
|||||||
DlDriveSchoolCourse course = BeanUtils.toBean(courseVO, DlDriveSchoolCourse.class);
|
DlDriveSchoolCourse course = BeanUtils.toBean(courseVO, DlDriveSchoolCourse.class);
|
||||||
saveOrUpdate(course);
|
saveOrUpdate(course);
|
||||||
coachCourseService.saveCoachCourse(course.getId(), courseVO.getName(), courseVO.getType(), courseVO.getCoachList());
|
coachCourseService.saveCoachCourse(course.getId(), courseVO.getName(), courseVO.getType(), courseVO.getCoachList());
|
||||||
|
// 保存提成信息
|
||||||
|
driveSchoolCourseDeductService.defaultAdd(course.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user