From 52579188bf29ef7130326fd70056f4d43b0e6216 Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Sun, 20 Apr 2025 12:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DlDriveSchoolCourseDeductController.java | 19 +++++++-- .../DlDriveSchoolCourseDeductService.java | 17 ++++++++ .../DlDriveSchoolCourseDeductServiceImpl.java | 39 +++++++++++++++++-- .../impl/DlDriveSchoolCourseServiceImpl.java | 5 +++ 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseDeductController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseDeductController.java index 73575a5a..f9066cf1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseDeductController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseDeductController.java @@ -6,9 +6,9 @@ import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseDeductService; import cn.iocoder.yudao.module.base.vo.DriveSchoolCourseDeductVO; import com.github.pagehelper.Page; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/base/drive-school-course-deduct") @@ -25,10 +25,23 @@ public class DlDriveSchoolCourseDeductController { * @param pageSize 每页条数 * @return @class DriveSchoolCourseDeductVO */ + @GetMapping("/page") public CommonResult page(DriveSchoolCourseDeductVO request, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNo, pageSize); return CommonResult.success(driveSchoolCourseDeductService.queryPage(page, request)); } + + /** + * 新增 + * + * @param list @class DriveSchoolCourseDeductVO + * @return id + */ + @PostMapping + public CommonResult add(List list) { + driveSchoolCourseDeductService.add(list); + return CommonResult.ok(); + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCourseDeductService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCourseDeductService.java index 1fd9afc0..003a4247 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCourseDeductService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCourseDeductService.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.Page; +import java.util.List; + /** * 提成配置Service接口 * @@ -23,4 +25,19 @@ public interface DlDriveSchoolCourseDeductService extends IService queryPage(Page page, DriveSchoolCourseDeductVO request); + + /** + * 新增提成配置 + * + * @param list 新增参数 + * @return 新增结果 + */ + void add(List list); + + /** + * 新增默认提成配置 + * + * @param courseId 课程id + */ + void defaultAdd(String courseId); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseDeductServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseDeductServiceImpl.java index c4f771ed..51541958 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseDeductServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseDeductServiceImpl.java @@ -1,5 +1,6 @@ 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.module.base.entity.DriveSchoolCourseDeduct; 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.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,10 +29,11 @@ import java.util.List; * @date 2024-05-07 */ @Service -public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl implements DlDriveSchoolCourseDeductService -{ - @Resource - private AdminUserApi userApi; +@RequiredArgsConstructor +public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl implements DlDriveSchoolCourseDeductService { + private final AdminUserApi userApi; + + private final IDriveSchoolDeductService deductService; /** * 分页查询提成配置 @@ -43,4 +46,32 @@ public class DlDriveSchoolCourseDeductServiceImpl extends ServiceImpl queryPage(Page page, DriveSchoolCourseDeductVO request) { return baseMapper.queryPage(page, request); } + + /** + * 新增提成配置 + * + * @param list 新增参数 + * @return 新增结果 + */ + @Override + public void add(List list) { + List driveSchoolCourseDeducts = BeanUtil.copyToList(list, DriveSchoolCourseDeduct.class); + saveBatch(driveSchoolCourseDeducts); + } + + /** + * 新增默认提成配置 + * + * @param courseId 课程id + */ + @Override + public void defaultAdd(String courseId) { + //查询默认提成配置 + List defaultDeduct = deductService.list(); + if (CollectionUtils.isNotEmpty(defaultDeduct)) { + List driveSchoolCourseDeducts = BeanUtil.copyToList(defaultDeduct, DriveSchoolCourseDeduct.class); + driveSchoolCourseDeducts.stream().map(driveSchoolCourseDeduct -> driveSchoolCourseDeduct.setCourseId(courseId)); + saveBatch(driveSchoolCourseDeducts); + } + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java index e4c2d5cc..e2d9c5b4 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java @@ -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.mapper.DlDriveSchoolCourseMapper; 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.vo.DlDriveSchoolCoachVO; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO; @@ -37,6 +38,8 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl