Explorar o código

响应数据增加枚举类型

Eric %!s(int64=3) %!d(string=hai) anos
pai
achega
63013ac67d

+ 5 - 5
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -108,10 +108,10 @@ public class CouponInfoVO {
         @ApiModelProperty("描述")
         private String describe;
 
-        @ApiModelProperty("客户端类型")
+        @ApiModelProperty("客户端类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
 
-        @ApiModelProperty("可用品类")
+        @ApiModelProperty("可用品类: UNIVERSAL(全场通用) VIP(小酷Ai) PIANO(云酷琴房) MALL(商场购物券) MUSIC(单曲点播券) SPARRING(陪练课购买券) LIVE(直播课购买券) VIDEO(视频课购买券) ")
         private String category;
 
         @ApiModelProperty("使用门槛")
@@ -178,10 +178,10 @@ public class CouponInfoVO {
         @ApiModelProperty("描述")
         private String describe;
 
-        @ApiModelProperty("客户端类型")
+        @ApiModelProperty("客户端类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
 
-        @ApiModelProperty("可用品类")
+        @ApiModelProperty("可用品类: UNIVERSAL(全场通用) VIP(小酷Ai) PIANO(云酷琴房) MALL(商场购物券) MUSIC(单曲点播券) SPARRING(陪练课购买券) LIVE(直播课购买券) VIDEO(视频课购买券) ")
         private String category;
 
         @ApiModelProperty("使用门槛")
@@ -190,7 +190,7 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠金额")
         private BigDecimal discountPrice;
 
-        @ApiModelProperty("优惠券类型")
+        @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
 
         @ApiModelProperty("有效天数")

+ 8 - 9
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/coupon/CouponTypeEnum.java

@@ -8,18 +8,18 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author: Eric
  * @date: 2022-03-30
  */
-public enum CouponTypeEnum implements BaseEnum<Integer, CouponTypeEnum> {
+public enum CouponTypeEnum implements BaseEnum<String, CouponTypeEnum> {
 
-    FULL_DISCOUNT(1,"满减券"),
-    VOUCHER(2,"代金券"),
+    FULL_DISCOUNT("满减券"),
+    VOUCHER("代金券"),
     ;
 
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    CouponTypeEnum(Integer code, String msg) {
-        this.code = code;
+    CouponTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -27,8 +27,7 @@ public enum CouponTypeEnum implements BaseEnum<Integer, CouponTypeEnum> {
         return this.msg;
     }
 
-    @Override
-    public Integer getCode() {
-        return this.code;
+    public String getCode() {
+        return code;
     }
 }

+ 7 - 5
cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/io/request/CouponInfoVO.java

@@ -26,10 +26,12 @@ public class CouponInfoVO {
     @ApiModel(value = "优惠券信息分页请求", description = "优惠券信息分页")
     public static class PageRequest extends QueryInfo {
 
-        @ApiModelProperty("客户类型")
+        @ApiModelProperty("客户类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
-        @ApiModelProperty("优惠券类型")
+
+        @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
+
         @ApiModelProperty("使用状态")
         private String useState;
 
@@ -53,10 +55,10 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券名称")
         private String name;
 
-        @ApiModelProperty("客户端类型")
+        @ApiModelProperty("客户端类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
 
-        @ApiModelProperty("优惠券类型")
+        @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
 
         @ApiModelProperty("使用门槛")
@@ -71,7 +73,7 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券ID")
         private Long couponId;
 
-        @ApiModelProperty("使用状态")
+        @ApiModelProperty("使用状态: EXPIRED(已失效) USABLE(可使用) USED(已使用) ")
         private String useState;
 
         @ApiModelProperty("使用时间")

+ 7 - 5
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/io/request/CouponInfoVO.java

@@ -26,10 +26,12 @@ public class CouponInfoVO {
     @ApiModel(value = "优惠券信息分页请求", description = "优惠券信息分页")
     public static class PageRequest extends QueryInfo {
 
-        @ApiModelProperty("客户类型")
+        @ApiModelProperty("客户类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
-        @ApiModelProperty("优惠券类型")
+
+        @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
+
         @ApiModelProperty("使用状态")
         private String useState;
 
@@ -53,10 +55,10 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券名称")
         private String name;
 
-        @ApiModelProperty("客户端类型")
+        @ApiModelProperty("客户端类型: TEACHER(老师端), STUDENT(学生端)")
         private String clientType;
 
-        @ApiModelProperty("优惠券类型")
+        @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
 
         @ApiModelProperty("使用门槛")
@@ -71,7 +73,7 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券ID")
         private Long couponId;
 
-        @ApiModelProperty("使用状态")
+        @ApiModelProperty("使用状态: EXPIRED(已失效) USABLE(可使用) USED(已使用) ")
         private String useState;
 
         @ApiModelProperty("使用时间")