华莱士开团促销需新增activityGroupStatus reason

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/QueryHistoryGroupVO.java

@@ -40,51 +40,56 @@ public class QueryHistoryGroupVO { //活动号
     //团信息
     private Group group;
 
+    //1-活动正常  2-库存不足 3-您参与次数达到上限  6- 活动已过期
+    private Integer activityGroupStatus;
+
     @Data
     public static class Participants {
-        @ApiModelProperty(value = "是否团长：0不是，1-是", name = "sponsor", example = "1")
+        //是否团长：0不是，1-是
         private Integer sponsor;
-        @ApiModelProperty(value = "团号", name = "groupId", example = "123")
+        //团号
         private String groupId;
-        @ApiModelProperty(value = "用户昵称", name = "headUrl", example = "123")
+        //用户昵称
         private String userName;
-        @ApiModelProperty(value = "头像", name = "headUrl", example = "2")
+        //头像
         private String headUrl;
-        @ApiModelProperty(value = "参团人数", name = "joinPeople", example = "2")
+        //参团人数
         private String orderId;
     }
 
     @Data
     public static class Good {
-        @ApiModelProperty(value = "商品id", name = "groupStatus", example = "1")
+        //商品id
         private String goodId;
-        @ApiModelProperty(value = "商品名称", name = "goodName", example = "2")
+        //商品名称
         private String goodName;
-        @ApiModelProperty(value = "拼团价，单位分", name = "price", example = "2021-04-21 23:59:59")
+        //拼团价，单位分
         private Integer price;
-        @ApiModelProperty(value = "商品原价，单位分", name = "originPrice", example = "2")
+        //商品原价，单位分
         private Integer originPrice;
     }
 
     @Data
     public static class Group {
-        @ApiModelProperty(value = "团号", name = "groupId", example = "1")
+        //团号
         private String groupId;
-        @ApiModelProperty(value = "活动号", name = "groupId", example = "1")
+        //活动号
         private String activeId;
-        @ApiModelProperty(value = "团状态：0-组团中，1-已成团，2-成团失败", name = "groupStatus", example = "1")
+        //团状态：0-组团中，1-已成团，2-成团失败
         private Integer groupStatus;
-        @ApiModelProperty(value = "开团开始时间", name = "startTime", example = "2021-04-15 00:00:00")
+        //开团开始时间
         private String startTime;
-        @ApiModelProperty(value = "开团结束时间", name = "endTime", example = "2021-04-21 23:59:59")
+        //开团结束时间
         private String endTime;
-        @ApiModelProperty(value = "差多少人成团", name = "lessPeople", example = "2")
+        //差多少人成团
         private Integer lessPeople;
-        @ApiModelProperty(value = "已参团人数", name = "count", example = "2")
+        //已参团人数
         private Integer count;
-        @ApiModelProperty(value = "成团时间", name = "groupTime", example = "2021-04-15 00:00:00")
+        //成团时间
         private String groupTime;
-        @ApiModelProperty(value = "剩余时间戳毫秒", name = "groupTime", example = "2021-04-15 00:00:00")
+        //剩余时间戳毫秒
         private Long time;
+        //退款原因1-活动失效，10-拼团超时，11-团长退款
+        private Integer reason;
     }
 }

order-application-service/src/main/java/cn/freemud/enums/OrderType.java

@@ -24,8 +24,7 @@ public enum OrderType {
     PRE_ORDER(2, "预订单"),
     MALL(3, "商城"),
     COLLECT_GOODS(4, "打包带走"),
-    EAT_IN(5, "店内就餐"),
-    SPELL_GROUP(6, "拼团")
+    EAT_IN(5, "店内就餐")
     ;
 
     private Integer code;