From a0e60bece6f45f9f06cb2b54e2d06d4bfcf82461 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Tue, 24 Jun 2025 13:51:31 +0800 Subject: [PATCH] --------------- --- .../controller/course/CourseController.java | 2 +- .../courseOrder/CourseOrderAddRequest.java | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java index fcb9565..07fc131 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java @@ -121,7 +121,7 @@ public class CourseController { * @param commonRequest 课程id * @return 课程基本信息 */ - @PostMapping("generate/qrcode") + @PostMapping("detail/id") @Operation(summary = "小程序端用户根据id查看课程基本信息", description = "参数:课程id,权限:管理员,方法名:miniQueryCourseBaseInfo") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息") diff --git a/src/main/java/com/greenorange/promotion/model/dto/courseOrder/CourseOrderAddRequest.java b/src/main/java/com/greenorange/promotion/model/dto/courseOrder/CourseOrderAddRequest.java index 0bded99..2d828bd 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/courseOrder/CourseOrderAddRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/courseOrder/CourseOrderAddRequest.java @@ -1,5 +1,6 @@ package com.greenorange.promotion.model.dto.courseOrder; +import com.greenorange.promotion.annotation.EnumValue; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Min; @@ -45,53 +46,54 @@ public class CourseOrderAddRequest implements Serializable { * 课程名称 */ @NotBlank(message = "课程名称不能为空") - @Schema(description = "课程名称", example = "") + @Schema(description = "课程名称", example = "数据分析工程师训练营") private String name; /** * 课程类别 */ @NotBlank(message = "课程类别不能为空") - @Schema(description = "课程类别", example = "") + @Schema(description = "课程类别", example = "自媒体") private String type; /** * 课程封面图片URL */ @NotBlank(message = "课程封面图片URL不能为空") - @Schema(description = "课程封面图片URL", example = "") + @Schema(description = "课程封面图片URL", example = "38EFJID33") private String image; /** * 课程原价 */ - @Schema(description = "课程原价", example = "") + @Schema(description = "课程原价", example = "20.00") private BigDecimal originPrice; /** - * 实际成交价格 + * 折扣价格 */ - @Schema(description = "实际成交价格", example = "") + @Schema(description = "折扣价格", example = "80.00") private BigDecimal discountPrice; /** * 订单总金额 */ - @Schema(description = "订单总金额", example = "") + @Schema(description = "订单总金额", example = "80.00") private BigDecimal totalAmount; /** * 支付交易号 */ @NotBlank(message = "支付交易号不能为空") - @Schema(description = "支付交易号", example = "") + @Schema(description = "支付交易号", example = "432332333324444444444444423") private String transactionNumber; /** * 订单状态 */ @NotBlank(message = "订单状态不能为空") - @Schema(description = "订单状态", example = "") +// @EnumValue(enumClass = CourseOrderStatusEnum.class) + @Schema(description = "订单状态", example = "order") private String orderStatus;