From 0ce090ba49e37710a129cf21ac762bbe43bcd50b Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期四, 06 七月 2023 11:17:35 +0800 Subject: [PATCH] 修改各个feign的请求封装参数 --- cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java index 7f02e63..e6e427f 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.entity.CancelledClasses; import com.dsh.course.entity.TCoursePackagePayment; +import com.dsh.course.feignclient.model.GetStuSessionList; import com.dsh.course.feignclient.model.PurchaseRecordVo; import com.dsh.course.service.CancelledClassesService; import com.dsh.course.service.TCoursePackagePaymentService; @@ -13,7 +14,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -36,20 +36,19 @@ /** * 获取课包对应的消费记录 - * @param stuId 学员id - * @param appUserId 用户id + * @param sessionList * @return */ @PostMapping("/base/cancelSource/cancelList") - public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){ + public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList){ List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>(); - List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId); + List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(sessionList.getStartTime(),sessionList.getEndTime(),null,sessionList.getStuId(), sessionList.getAppUserId()); List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList()); List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>() .in("coursePackageId", coursePackageIds) - .between("insertTime",startTime,endTime)); + .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime())); if (list.size() > 0){ list.forEach( canse -> { PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo(); -- Gitblit v1.7.1