shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-05-13 10:05:10 +08:00
parent e22d386ceb
commit 931bf1ef7b
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-xq/src/main/java/com/ruoyi/xq/domain/ActivityShop.java
View File

@@ -35,6 +35,8 @@ public class ActivityShop implements Serializable {
* 活动展示图片
*/
private String activityBanner;
private LocalDateTime activityStartTime;
private LocalDateTime activityEndTime;
/**
* 开始时间
*/

9
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/activity/ActivityShopAppList.java
View File

@@ -31,13 +31,18 @@ public class ActivityShopAppList implements Serializable {
/**
* 开始时间
*/
@Schema(description = "开始时间")
@Schema(description = "报名开始时间")
private LocalDateTime startTime;
/**
* 结束时间
*/
@Schema(description = "结束时间")
@Schema(description = "报名结束时间")
private LocalDateTime endTime;
@Schema(description = "活动开始时间")
private LocalDateTime activityStartTime;
@Schema(description = "活动结束时间")
private LocalDateTime activityEndTime;
/**
* 城市名称
*/

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java
View File

@@ -122,6 +122,8 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
appInfo.setJoinWomenPrice(activityShop.getJoinWomenPrice());
appInfo.setJoinManPrice(activityShop.getJoinManPrice());
appInfo.setJoinActivity(joinActivity);
appInfo.setActivityStartTime(activityShop.getActivityStartTime());
appInfo.setActivityEndTime(activityShop.getActivityEndTime());
return appInfo;
}

2
ruoyi-xq/src/main/resources/mapper/xq/ActivityShopMapper.xml
View File

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="pageApp" resultType="com.ruoyi.xq.dto.app.activity.ActivityShopAppList">
select
t1.id, t1.activity_code, t1.activity_text, t1.activity_banner,
t1.start_time, t1.end_time, t1.city_code, t1.city_name,
t1.start_time, t1.end_time, t1.city_code, t1.city_name,t1.activity_start_time,t1.activity_end_time,
t1.women_max_num, t1.man_max_num, t1.join_man_price, t1.join_women_price
from xq_activity_shop t1
order by ABS(TIMESTAMPDIFF(MINUTE,t1.start_time, now()))