Browse Source

双十一活动

zouxuan 3 years ago
parent
commit
51db0a6c3e

+ 21 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityDetailDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class ActivityDetailDto {
 	private Integer activityId;
@@ -19,6 +20,26 @@ public class ActivityDetailDto {
 
 	private BigDecimal courseNum;
 
+	private Date startTime;
+
+	private Date endTime;
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
 	public BigDecimal getCourseNum() {
 		return courseNum;
 	}

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/MarketActivityMapper.xml

@@ -77,10 +77,12 @@
 		<result property="categoryName" column="category_name_"/>
 		<result property="categoryId" column="category_id_"/>
 		<result property="courseNum" column="course_num_"/>
+		<result property="startTime" column="start_time_"/>
+		<result property="endTime" column="end_time_"/>
 	</resultMap>
     <select id="queryActivity" resultMap="ActivityDetailDto">
 		SELECT vga.id_,vga.name_,vga.description_,vga.market_price_,vgc.name_ category_name_,
-		vgc.id_ category_id_,vga.min_course_num_ course_num_
+		vgc.id_ category_id_,vga.min_course_num_ course_num_,vga.start_time_,vga.end_time_
 		FROM market_activity ma
 		LEFT JOIN vip_group_activity vga ON FIND_IN_SET(vga.id_,ma.activity_ids_)
 		LEFT JOIN vip_group_category vgc ON vgc.id_ = vga.vip_group_category_id_list_

+ 9 - 1
mec-student/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -74,7 +74,15 @@ public class ActivityController extends BaseController {
             return failed("用户信息有误,没有分部信息");
         }
         Map<String,Object> resultMap = new HashMap<>(1);
-        resultMap.put("activityDetailList",marketActivityService.queryActivity(2,sysUser.getOrganId()));
+        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(2, sysUser.getOrganId());
+        resultMap.put("activityDetailList",activityDetailDtos);
+        resultMap.put("startTime",null);
+        resultMap.put("endTime",null);
+        if(activityDetailDtos != null && activityDetailDtos.size() > 0){
+            ActivityDetailDto activityDetailDto = activityDetailDtos.get(0);
+            resultMap.put("startTime",activityDetailDto.getStartTime());
+            resultMap.put("endTime",activityDetailDto.getEndTime());
+        }
 //        resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(2));
 //        LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),2);
 //        if(luckDrawCount != null){