ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommunityActivityController.java
@@ -247,40 +247,40 @@ return R.ok(); } @Log(title = "社区活动管理信息-社区活动报名信息导出", businessType = BusinessType.EXPORT) @ApiOperation(value = "社区活动报名信息导出") @PostMapping("/exportRegistration") public void exportRegistration(@RequestBody RegistrationPageListQuery query){ List<TRegistrationExport> registrationExports = communityActivityRegistrationService.exportRegistration(query); for (TRegistrationExport registrationExport : registrationExports) { if(Objects.nonNull(registrationExport.getCreateTime())){ registrationExport.setCreateTimeStr(DateUtils.localDateTimeToString(registrationExport.getCreateTime())); @Log(title = "社区活动管理信息-社区活动报名信息导出", businessType = BusinessType.EXPORT) @ApiOperation(value = "社区活动报名信息导出") @PostMapping("/exportRegistration") public void exportRegistration(@RequestBody RegistrationPageListQuery query){ List<TRegistrationExport> registrationExports = communityActivityRegistrationService.exportRegistration(query); for (TRegistrationExport registrationExport : registrationExports) { if(Objects.nonNull(registrationExport.getCreateTime())){ registrationExport.setCreateTimeStr(DateUtils.localDateTimeToString(registrationExport.getCreateTime())); } } } Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TRegistrationExport.class, registrationExports); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { String fileName = URLEncoder.encode("社区活动报名信息.xls", "utf-8"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); outputStream = response.getOutputStream(); workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); } finally { Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TRegistrationExport.class, registrationExports); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { outputStream.close(); String fileName = URLEncoder.encode("社区活动报名信息.xls", "utf-8"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); outputStream = response.getOutputStream(); workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); } finally { try { outputStream.close(); } catch (IOException e) { e.printStackTrace(); } } } } }
@@ -108,6 +108,23 @@ return R.ok(courseOrderVO); } @Log(title = "课程订单管理信息-批量通过支付审核", businessType = BusinessType.UPDATE) @ApiOperation(value = "批量通过支付审核") @PostMapping(value = "/agreePay") public R<Boolean> agreePay(@RequestBody List<String> ids) { List<TCourseOrder> tCourseOrders = courseOrderService.listByIds(ids); long count = tCourseOrders.stream().filter(e -> e.getPayStatus() != 0).count(); if(count > 0){ return R.fail("存在无需审核的订单"); } tCourseOrders.forEach(e -> { e.setPayStatus(1); }); courseOrderService.updateBatchById(tCourseOrders); return R.ok(); } /** * 审核课程订单管理退款申请 */ ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
@@ -130,26 +130,26 @@ courseOrder.setAppUserId(userId); courseOrder.setPayMoney(course.getCourseCost()); courseOrder.setPayStatus(1); courseOrder.setPayStatus(0); 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); // return R.ok(); } return R.fail("报名失败"); // 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); //// return R.ok(); // } return R.ok(); } @PostMapping("/payOrder") @@ -161,6 +161,9 @@ // if(!userId.equals(courseOrder1.getAppUserId())){ // return R.fail("无权限操作"); // } if(courseOrder1.getPayStatus()!=1){ return R.fail("订单目前无法支付"); } courseOrder1.setOrderNumber(OrderNos.getDid()); courseOrder1.setRealName(courseOrder.getRealName()); courseOrder1.setUserPhone(courseOrder.getUserPhone()); ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java
@@ -72,7 +72,7 @@ @TableField("id_card") private String idCard; @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款 4=已取消 5=已完成 6退款中") @ApiModelProperty(value = "支付状态 0待审核 1=待支付 2=已支付 3=已退款 4=已取消 5=已完成 6退款中") @TableField("pay_status") private Integer payStatus;
