活动分组新增活动截止时间字段

src/main/java/com/sqx/modules/activity/vo/ShopActivityGroupVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,7 +39,16 @@ public class ShopActivityGroupVO {
         @ApiModelProperty("活动名称")
         private String activityTitle;
 
-        @ApiModelProperty("活动限制")
+        @ApiModelProperty("活动截止时间")
+        private Date activityEndTime;
+
+        @ApiModelProperty("活动限制 1无限制、2仅针对第一次下单")
         private String suitType;
+
+        @ApiModelProperty("限制类型 1无限制、2数量限制")
+        private String limitType;
+
+        @ApiModelProperty("限制数量")
+        private Integer limitValue;
     }
 }

src/main/resources/mapper/activity/ActivityShopDao.xml

@@ -25,7 +25,10 @@
             <result column="type" property="activityType"/>
             <collection property="activityInGroups" ofType="com.sqx.modules.activity.vo.ShopActivityGroupVO$ActivityInGroup">
                 <result column="title" property="activityTitle"/>
+                <result column="end_time" property="activityEndTime"/>
                 <result column="suit_type" property="suitType"/>
+                <result column="limit_type" property="limitType"/>
+                <result column="limit_value" property="limitValue"/>
             </collection>
         </collection>
     </resultMap>
@@ -35,7 +38,10 @@
             ach.shop_id,
             a.type,
             a.title,
-            ach.suit_type
+            a.end_time,
+            ach.suit_type,
+            ach.limit_type,
+            ach.limit_value
         from activity_shop ach
         left join activity a on a.id = ach.activity_id
         where ach.shop_id = #{shopId}
@@ -62,7 +68,7 @@
 
     <select id="getShopActivityBOByShopId" resultType="com.sqx.modules.activity.bo.ShopActivityBO">
         select
-            a.id,
+            a.id activityId,
             ach.id activityShopId,
             ach.shop_id,
             ach.suit_type,