bug修改

xuhy

2025-11-27 51909b45d3d04b7bf667ba7bb52d7ea6353de3be

bug修改

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java

@@ -86,8 +86,6 @@
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TCourseOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery()
                        .and(e->e.ne(TCourseOrder::getPayStatus, 1)
                                .ge(TCourseOrder::getCreateTime, LocalDateTime.now().minusMinutes(15)))
                .eq(TCourseOrder::getAppUserId, userId)
                .eq(Objects.nonNull(query.getPayStatus()),TCourseOrder::getPayStatus, query.getPayStatus())
                .orderByDesc(TCourseOrder::getCreateTime));
@@ -138,23 +136,20 @@
        courseOrder.setOrderNumber(OrderNos.getDid());
        boolean save = courseOrderService.save(courseOrder);
        if (save) {
            Map<String, ? extends Object> maps =
                    new ImmutableMap.Builder<String, String>().
                            put("id", courseOrder.getId())
                            .build();
            QuartzManager.addJob(
                    OrderJob.class,
                    (OrderJob.name+courseOrder.getId()).toUpperCase(),
                    TimeJobType.CANCEL_ORDER,
                    DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
                    maps
            );
            Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
            return R.ok(result);
        }

        Map<String, ? extends Object> maps =
                new ImmutableMap.Builder<String, String>().
                        put("id", courseOrder.getId())
                        .build();
        QuartzManager.addJob(
                OrderJob.class,
                (OrderJob.name+courseOrder.getId()).toUpperCase(),
                TimeJobType.CANCEL_ORDER,
                DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
                maps
        );


        return R.fail("报名失败");
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java

@@ -70,7 +70,7 @@

    @ApiOperation(value = "个人中心--托育服务记录详情",response = TChildcareServices.class)
    @GetMapping(value = "/getChildcareServicesDetail/{id}")
    public R<TChildcareServices> getChildcareServicesList(@PathVariable String id) {
    public R<TChildcareServices> getChildcareServicesDetail(@PathVariable String id) {
        TChildcareServices childcareServices = tChildcareServicesService.getById(id);
        return R.ok(childcareServices);
    }