cup 2 tahun lalu
induk
melakukan
15649fdfa8

+ 2 - 2
mp-common/src/main/java/com/qs/mp/common/enums/ChannelOrderTypeEnum.java

@@ -13,8 +13,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum ChannelOrderTypeEnum implements IEnum<Integer> {
 
     RETAIL(1,"普通票"),
-    OFFLINE_PRE(2,"线下预票"),
-    ONLINE_PRE(3,"线上预票");
+    OFFLINE_PRE(2,"线下预票"),
+    ONLINE_PRE(3,"线上预票");
 
     private final int value;
     private final String desc;

+ 2 - 4
mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelMyTicketVO.java

@@ -63,11 +63,9 @@ public class ChannelMyTicketVO {
     private Date createdTime;
 
     @ApiModelProperty("票包类型")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     public ChannelOrderTypeEnum getType() {
-        if (Objects.isNull(this.isPre)) {
-            return null;
-        }
-        if (this.isPre == 0){
+        if (Objects.isNull(this.isPre) || this.isPre == 0){
             return ChannelOrderTypeEnum.RETAIL;
         } else {
             if (TicketTypeEnum.OFFLINE.equals(this.ticketType)){