From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 四月 2025 10:05:32 +0800 Subject: [PATCH] bug修改 --- cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 86 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 79 insertions(+), 7 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java index 1d0f34f..301d0d0 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java @@ -59,11 +59,14 @@ @Autowired private TCoursePackageDiscountService discountService; + @Autowired private ICoursePackagePaymentConfigService coursePackagePaymentConfigService; @Autowired private ICoursePackageOrderService coursePackageOrderService; + + /** * 上/下架 1为上架 2为下架 3为删除 @@ -126,6 +129,29 @@ return ResultUtil.runErr(); } } + + @ResponseBody + @PostMapping("/base/course/queryCoursePackageType") + @ApiOperation(value = "获取课程类型列表", tags = {"APP-课程列表"}) + @ApiImplicitParams({ + }) + public ResultUtil<List<BaseVo>> queryCoursePackageType1() { + try { + List<TCoursePackageType> coursePackageTypes = coursePackageTypeService.list(new QueryWrapper<TCoursePackageType>().eq("state", 1)); + List<BaseVo> list = new ArrayList<>(); + coursePackageTypes.forEach(c -> { + BaseVo baseVo = new BaseVo(); + BeanUtils.copyProperties(c, baseVo); + list.add(baseVo); + }); + return ResultUtil.success(list); + } catch (Exception e) { + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + @ResponseBody @@ -214,7 +240,7 @@ } } - // 2.0 + @ResponseBody @PostMapping("/api/course/paymentCourseCouponList") @ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"}) @@ -292,7 +318,6 @@ e.printStackTrace(); } } - /** * 根据id获取课程数据 @@ -434,10 +459,12 @@ public List<String> queryPackageById(@RequestBody Integer coursePackageId) { ArrayList<String> strings = new ArrayList<>(); TCoursePackage byId = coursePackageService.getById(coursePackageId); + if(null == byId){ + return null; + } Integer coursePackageTypeId = byId.getCoursePackageTypeId(); strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName()); strings.add(byId.getName()); - return strings; } @@ -500,14 +527,12 @@ @PostMapping("/course/auditDiscount") public Boolean auditDiscount(@RequestBody AuditDiscount auditDiscount) { - List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>() .eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId())); for (TCoursePackageDiscount tCoursePackageDiscount : list) { tCoursePackageDiscount.setAuditStatus(auditDiscount.getType()); tCoursePackageDiscount.setAuditRemark(auditDiscount.getText()); } - return discountService.updateBatchById(list); } @@ -525,8 +550,6 @@ selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours())); integerList.add(selectDto); } - - return integerList; } @@ -600,4 +623,53 @@ return map1; } + + + /** + * 课包支付成功后排课操作 + * @param addCoursePackageOrderStudent + */ + @PostMapping("/course/addCoursePackageOrderStudent") + public void addCoursePackageOrderStudent(@RequestBody AddCoursePackageOrderStudent addCoursePackageOrderStudent){ + coursePackageService.addCoursePackageOrderStudent(addCoursePackageOrderStudent.getCoursePackageOrderId(), addCoursePackageOrderStudent.getCoursePackagePaymentConfig()); + } + + + /** + * 根据code获取待支付数据 + * @param code + * @return + */ + @PostMapping("/course/getCoursePackageOrderByCode") + public CoursePackageOrder getCoursePackageOrderByCode(@RequestBody String code){ + CoursePackageOrder coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>() + .eq("code", code).eq("state", 1)); + return coursePackageOrder; + } + + + /** + * 修改数据 + * @param coursePackageOrder + */ + @PostMapping("/course/updateCoursePackageOrder") + public void updateCoursePackageOrder(@RequestBody CoursePackageOrder coursePackageOrder){ + coursePackageOrder.setAppUserId(null); + coursePackageOrderService.updateById(coursePackageOrder); + } + + + /** + * 获取课包配置 + * @param getCoursePackagePaymentConfig + * @return + */ + @PostMapping("/course/getCoursePackagePaymentConfig") + public CoursePackagePaymentConfig getCoursePackagePaymentConfig(@RequestBody GetCoursePackagePaymentConfig getCoursePackagePaymentConfig){ + CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>() + .eq("coursePackageId", getCoursePackagePaymentConfig.getCoursePackageId()) + .eq("classHours", getCoursePackagePaymentConfig.getClassHours()) + ); + return coursePackagePaymentConfig; + } } -- Gitblit v1.7.1