From 286ec64bef28b6829c3cc354114c5e5f89b68ada Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 18 Aug 2026 08:32:39 +0800 Subject: [PATCH] commit --- .../CoffeeTicketActivityController.java | 105 +++ .../controller/CoffeeTicketNewController.java | 106 +++ .../CoffeeTicketStatisticsController.java | 167 +++++ .../H5CoffeeTicketActivityController.java | 44 ++ .../H5CoffeeTicketDetailController.java | 89 +++ .../H5CoffeeTicketMineController.java | 64 ++ .../models/CoffeeTicketActivity.java | 131 ++++ .../models/CoffeeTicketRecord.java | 74 +++ .../service/CoffeeTicketActivityService.java | 79 +++ .../service/CoffeeTicketRecordService.java | 117 ++++ .../impl/CoffeeTicketActivityServiceImpl.java | 348 ++++++++++ .../impl/CoffeeTicketRecordServiceImpl.java | 296 +++++++++ .../vo/CoffeeTicketActivityH5DetailVO.java | 28 + .../vo/CoffeeTicketActivityH5ListVO.java | 27 + .../vo/CoffeeTicketGrabStatisticsVO.java | 70 ++ .../vo/CoffeeTicketMineListVO.java | 24 + .../mobile/coffeeTicket/detail/index.html | 618 ++++++++++++++++++ .../views/mobile/coffeeTicket/list/index.html | 402 ++++++++++++ .../views/mobile/coffeeTicket/mine/index.html | 354 ++++++++++ .../platform/coffeeTicket/activity/index.html | 203 ++++++ .../platform/coffeeTicket/new/index.html | 477 ++++++++++++++ .../coffeeTicket/statistics/index.html | 274 ++++++++ 22 files changed, 4097 insertions(+) create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketActivityController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketNewController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketStatisticsController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketActivityController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketDetailController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketMineController.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketActivity.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketRecord.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketActivityService.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketRecordService.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketActivityServiceImpl.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketRecordServiceImpl.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5DetailVO.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5ListVO.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketGrabStatisticsVO.java create mode 100644 src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketMineListVO.java create mode 100644 src/main/resources/views/mobile/coffeeTicket/detail/index.html create mode 100644 src/main/resources/views/mobile/coffeeTicket/list/index.html create mode 100644 src/main/resources/views/mobile/coffeeTicket/mine/index.html create mode 100644 src/main/resources/views/platform/coffeeTicket/activity/index.html create mode 100644 src/main/resources/views/platform/coffeeTicket/new/index.html create mode 100644 src/main/resources/views/platform/coffeeTicket/statistics/index.html diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketActivityController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketActivityController.java new file mode 100644 index 0000000..73e7ef8 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketActivityController.java @@ -0,0 +1,105 @@ +package io.v.nutz.zhgh.coffeeTicket.controller; + +import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.result.Result; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.validation.Valid; + +@IocBean +@At("/platform/coffeeTicket/activity") +@Ok("json:full") +public class CoffeeTicketActivityController { + + @Inject + private CoffeeTicketActivityService coffeeTicketActivityService; + + /** + * 打开咖啡抢票活动管理页面。 + */ + @At("") + @Ok("beetl:/platform/coffeeTicket/activity/index.html") + @RequiresPermissions("coffeeTicket.activity") + public void index() { + } + + /** + * 分页查询咖啡抢票活动。 + * + * @param pageForm 分页参数，包含 pageNumber、pageSize、排序字段等公共分页信息 + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时不按年度筛选 + * @param title 活动标题关键字；为空时不按标题筛选 + * @return Result，data 为 Pagination，list 为活动列表，totalCount 为总数 + */ + @At + @RequiresPermissions("coffeeTicket.activity") + public Result pageData(@Valid PageForm pageForm, Integer year, String title) { + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(activityStartDate)", "=", year); + if (StrUtil.isNotBlank(title)) { + cnd.and(Cnd.likeEX("title", title)); + } + cnd.desc("createdAt"); + Pagination pagination = coffeeTicketActivityService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); + return Result.success(pagination); + } + + /** + * 查询一条活动配置，用于管理列表和编辑页面回显。 + * + * @param id 咖啡票活动ID + * @return Result，data 为 CoffeeTicketActivity；活动不存在时 data 为空 + */ + @At + @RequiresPermissions(value = {"coffeeTicket.activity", "coffeeTicket.new"}, logical = Logical.OR) + public Result findOne(@Valid String id) { + CoffeeTicketActivity activity = coffeeTicketActivityService.fetch(id); + return Result.success(activity); + } + + /** + * 删除活动配置并同步移除首页活动入口。 + * + * @param id 咖啡票活动ID + * @return Result，code 为 0 表示删除成功 + */ + @At + @RequiresPermissions("coffeeTicket.activity") + @Aop(TransAop.READ_COMMITTED) + public Result delete(@Valid String id) { + coffeeTicketActivityService.deleteActivity(id); + return Result.success(); + } + + /** + * 开启或关闭咖啡抢票活动。 + * + * @param id 活动ID，传 coffee_ticket_activity 表主键 + * @param enabled true 表示开启报名并推送首页，false 表示关闭报名并移除首页入口 + * @return Result，成功后前端刷新列表即可看到最新状态 + */ + @At + @RequiresPermissions("coffeeTicket.activity") + @Aop(TransAop.READ_COMMITTED) + public Result updateEnabled(@Param("id") @Valid String id, @Param("enabled") Boolean enabled) { + try { + coffeeTicketActivityService.updateEnabled(id, enabled); + return Result.success().addMsg(Boolean.TRUE.equals(enabled) ? "开启成功" : "关闭成功"); + } catch (IllegalStateException e) { + return Result.error(e.getMessage()); + } + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketNewController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketNewController.java new file mode 100644 index 0000000..411ea0c --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketNewController.java @@ -0,0 +1,106 @@ +package io.v.nutz.zhgh.coffeeTicket.controller; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.result.Result; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.validation.Valid; + +@IocBean +@At("/platform/coffeeTicket/new") +@Ok("json:full") +public class CoffeeTicketNewController { + + @Inject + private CoffeeTicketActivityService coffeeTicketActivityService; + + /** + * 打开咖啡抢票活动新增或编辑页面。 + */ + @At("") + @Ok("beetl:/platform/coffeeTicket/new/index.html") + @RequiresPermissions("coffeeTicket.new") + public void index() { + } + + /** + * 保存咖啡抢票活动。 + * + * @param activity 页面提交的活动配置，包含标题、封面、描述、活动开始/结束日期、可预约星期、活动总票数、每人每次可抢票数、每日预约时间段、可报名人员范围、预约方式、活动地点和参与须知 + * @return Result，成功时 data 为 CoffeeTicketActivity，可通过 data.id 获取活动ID + */ + @At + @RequiresPermissions("coffeeTicket.new") + @Aop(TransAop.READ_COMMITTED) + public Result save(@Param("data") @Valid CoffeeTicketActivity activity) { + Result validateResult = validateActivity(activity); + if (validateResult != null) { + return validateResult; + } + try { + CoffeeTicketActivity savedActivity = coffeeTicketActivityService.saveActivity(activity); + return Result.success(savedActivity); + } catch (IllegalStateException e) { + return Result.error(e.getMessage()); + } + } + + /** + * 只做入参完整性和范围校验，业务保存交给 service 层处理。 + */ + private Result validateActivity(CoffeeTicketActivity activity) { + if (activity == null) { + return Result.error("活动信息不能为空"); + } + if (StrUtil.isBlank(activity.getTitle())) { + return Result.error("请输入活动标题"); + } + if (StrUtil.isBlank(activity.getCover())) { + return Result.error("请上传活动封面"); + } + if (StrUtil.isBlank(activity.getDescription())) { + return Result.error("请输入活动描述"); + } + if (activity.getActivityStartDate() == null || activity.getActivityEndDate() == null) { + return Result.error("请选择活动周期"); + } + if (activity.getActivityStartDate().after(activity.getActivityEndDate())) { + return Result.error("活动结束日期必须晚于开始日期"); + } + if (CollUtil.isEmpty(activity.getWeekDays())) { + return Result.error("请选择可预约星期"); + } + if (activity.getTicketCount() == null || activity.getTicketCount() <= 0) { + return Result.error("活动总票数必须大于0"); + } + if (activity.getPerUserTicketNum() == null || activity.getPerUserTicketNum() <= 0) { + return Result.error("每人每次可抢票数必须大于0"); + } + if (activity.getPerUserTicketNum() > activity.getTicketCount()) { + return Result.error("每人每次可抢票数不能大于活动总票数"); + } + if (StrUtil.isBlank(activity.getReserveStartTime()) || StrUtil.isBlank(activity.getReserveEndTime())) { + return Result.error("请选择每日可预约时间段"); + } + if (activity.getReserveStartTime().compareTo(activity.getReserveEndTime()) >= 0) { + return Result.error("每日可预约结束时间必须晚于开始时间"); + } + if (StrUtil.isBlank(activity.getReserveMode())) { + return Result.error("请选择预约方式"); + } + if (activity.getActivityGroupId() == null) { + return Result.error("请选择可报名人员范围"); + } + return null; + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketStatisticsController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketStatisticsController.java new file mode 100644 index 0000000..0f4b1c9 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/controller/CoffeeTicketStatisticsController.java @@ -0,0 +1,167 @@ +package io.v.nutz.zhgh.coffeeTicket.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.hutool.core.date.DateUtil; +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.result.Result; +import io.v.nutz.base.utils.CommonDownloadUtil; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketRecordService; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketGrabStatisticsVO; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@IocBean +@At("/platform/coffeeTicket/statistics") +@Ok("json:full") +public class CoffeeTicketStatisticsController { + + @Inject + private CoffeeTicketActivityService coffeeTicketActivityService; + + @Inject + private CoffeeTicketRecordService coffeeTicketRecordService; + + /** + * 打开咖啡抢票统计页面。 + */ + @At("") + @Ok("beetl:/platform/coffeeTicket/statistics/index.html") + @RequiresPermissions("coffeeTicket.statistics") + public void index() { + } + + /** + * 查询统计页活动下拉列表。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时返回全部活动 + * @return Result，data 为 List，前端使用 id 作为活动值、title 作为活动名称 + */ + @At + @RequiresPermissions("coffeeTicket.statistics") + public Result activityList(@Param("year") Integer year) { + return Result.success(coffeeTicketActivityService.statisticsActivityList(year)); + } + + /** + * 分页查询咖啡抢票统计明细。 + * + * @param pageForm 分页参数，包含 pageNumber、pageSize、排序字段等公共分页信息 + * @param year 活动开始日期所属年度，传 yyyy 年份；为空且 activityId 为空时查询全部记录 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @param grabDate 抢票日期，传 yyyy-MM-dd；为空时不按实际抢票日期筛选 + * @return Result，data 为 Pagination，list 为 CoffeeTicketGrabStatisticsVO 抢票明细列表 + */ + @At + @RequiresPermissions("coffeeTicket.statistics") + public Result pageData(@Valid PageForm pageForm, @Param("year") Integer year, @Param("activityId") String activityId, + @Param("unionId") String unionId, @Param("unitId") String unitId, @Param("grabDate") String grabDate) { + Pagination pagination = coffeeTicketRecordService.statisticsPageData(pageForm, year, activityId, unionId, unitId, grabDate); + return Result.success(pagination); + } + + /** + * 查询当前统计条件下有抢票记录的日期。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时不按年度筛选 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @return Result，data 为 yyyy-MM-dd 字符串列表，用于限制抢票日期选择器可选日期 + */ + @At + @RequiresPermissions("coffeeTicket.statistics") + public Result grabDateList(@Param("year") Integer year, @Param("activityId") String activityId, + @Param("unionId") String unionId, @Param("unitId") String unitId) { + return Result.success(coffeeTicketRecordService.statisticsGrabDateList(year, activityId, unionId, unitId)); + } + + /** + * 导出当前筛选条件下的咖啡抢票统计明细。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时不按年度筛选 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @param grabDate 抢票日期，传 yyyy-MM-dd；为空时不按实际抢票日期筛选 + * @param response HttpServletResponse，用于输出 xlsx 文件流 + * @return void，浏览器直接下载 Excel 文件 + */ + @At + @Ok("void") + @RequiresPermissions("coffeeTicket.statistics") + public void export(@Param("year") Integer year, @Param("activityId") String activityId, + @Param("unionId") String unionId, @Param("unitId") String unitId, + @Param("grabDate") String grabDate, HttpServletResponse response) { + List list = coffeeTicketRecordService.statisticsExportList(year, activityId, unionId, unitId, grabDate); + List exportList = list.stream().map(this::buildExportRow).collect(Collectors.toList()); + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("姓名", "userName", 20)); + entities.add(new ExcelExportEntity("工号", "loginName", 20)); + entities.add(new ExcelExportEntity("单位", "unitName", 25)); + entities.add(new ExcelExportEntity("分工会", "unionName", 25)); + entities.add(new ExcelExportEntity("活动名称", "activityTitle", 30)); + entities.add(new ExcelExportEntity("抢票张数", "ticketNum", 15)); + entities.add(new ExcelExportEntity("实际抢票时间", "grabTime", 25)); + + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, exportList); + CommonDownloadUtil.download("咖啡抢票统计.xlsx", workbook, response); + } + + /** + * 删除统计页面中的一条抢票记录。 + * + * @param recordId 抢票记录ID，传 coffee_ticket_record 表主键；删除后该用户可重新参与该活动抢票 + * @return Result，code 为 0 表示删除成功；非 0 时 msg 为失败原因 + */ + @At + @Aop(TransAop.READ_COMMITTED) + @RequiresPermissions("coffeeTicket.statistics.delete") + public Result delete(@Param("recordId") @Valid String recordId) { + try { + coffeeTicketRecordService.deleteStatisticsRecord(recordId); + return Result.success(); + } catch (IllegalStateException e) { + return Result.error(e.getMessage()); + } + } + + /** + * 组装导出行数据，字段与页面当前统计列表保持一致，不包含操作列。 + * + * @param item 一条抢票统计明细 + * @return NutMap，key 与 ExcelExportEntity 中的字段名对应 + */ + private NutMap buildExportRow(CoffeeTicketGrabStatisticsVO item) { + return NutMap.NEW() + .setv("userName", item.getUserName()) + .setv("loginName", item.getLoginName()) + .setv("unitName", item.getUnitName()) + .setv("unionName", item.getUnionName()) + .setv("activityTitle", item.getActivityTitle()) + .setv("ticketNum", item.getTicketNum()) + .setv("grabTime", item.getGrabTime() == null ? "" : DateUtil.format(item.getGrabTime(), "yyyy-MM-dd HH:mm:ss")); + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketActivityController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketActivityController.java new file mode 100644 index 0000000..9913d57 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketActivityController.java @@ -0,0 +1,44 @@ +package io.v.nutz.zhgh.coffeeTicket.h5controller; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.result.Result; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.validation.Valid; + +@IocBean +@At("/platform/h5/coffeeTicket/list") +@Ok("json:full") +public class H5CoffeeTicketActivityController { + + @Inject + private CoffeeTicketActivityService coffeeTicketActivityService; + + /** + * 打开移动端咖啡抢票活动列表页面。 + */ + @At("") + @Ok("beetl:/mobile/coffeeTicket/list/index.html") + @RequiresAuthentication + public void index() { + } + + /** + * 手机端抢票活动列表。 + * + * @param pageForm 分页参数，searchKeyword 可传活动标题或活动地点关键字 + * @param status 状态筛选，all全部、active报名中、upcoming即将开始、ended已结束 + * @return Result，data 为 Pagination，list 为 CoffeeTicketActivity 活动列表 + */ + @At + @RequiresAuthentication + public Result pageData(@Valid PageForm pageForm, String status) { + return Result.success(coffeeTicketActivityService.h5PageData(pageForm, status)); + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketDetailController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketDetailController.java new file mode 100644 index 0000000..0faf208 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketDetailController.java @@ -0,0 +1,89 @@ +package io.v.nutz.zhgh.coffeeTicket.h5controller; + +import cn.hutool.core.bean.BeanUtil; +import io.v.nutz.base.result.Result; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketRecord; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketRecordService; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketActivityH5DetailVO; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.validation.Valid; + +@IocBean +@At("/platform/h5/coffeeTicket/detail") +@Ok("json:full") +public class H5CoffeeTicketDetailController { + + @Inject + private CoffeeTicketActivityService coffeeTicketActivityService; + + @Inject + private CoffeeTicketRecordService coffeeTicketRecordService; + + /** + * 打开移动端咖啡抢票活动详情页面。 + */ + @At("") + @Ok("beetl:/mobile/coffeeTicket/detail/index.html") + @RequiresAuthentication + public void index() { + } + + /** + * 查询移动端活动详情，并补充当前用户抢票状态。 + * + * @param id 咖啡票活动ID + * @return Result，data 为 CoffeeTicketActivityH5DetailVO，包含活动详情和当前用户抢票信息 + */ + @At + @RequiresAuthentication + public Result findOne(@Valid String id) { + CoffeeTicketActivity activity = coffeeTicketActivityService.fetch(id); + if (activity == null) { + return Result.error("活动不存在"); + } + if (!Boolean.TRUE.equals(activity.getEnabled())) { + return Result.error("活动未开启"); + } + String scopeMsg = coffeeTicketActivityService.checkH5ActivityUserScope(activity, ShiroUtil.getUserId()); + if (scopeMsg != null) { + return Result.error(scopeMsg); + } + CoffeeTicketActivityH5DetailVO detailVO = BeanUtil.copyProperties(activity, CoffeeTicketActivityH5DetailVO.class); + CoffeeTicketRecord userRecord = coffeeTicketRecordService.fetchLatestUserRecord(id, ShiroUtil.getUserId()); + detailVO.setHasGrabbed(userRecord != null); + detailVO.setMyTicketNum(userRecord == null ? 0 : coffeeTicketRecordService.countUserTicketNum(id, ShiroUtil.getUserId())); + detailVO.setMyGrabTime(userRecord == null ? null : userRecord.getGrabTime()); + return Result.success(detailVO); + } + + /** + * 手机端立即抢票并保存记录。 + * + * @param id 活动ID，前端从详情页地址参数或活动详情数据中传入 + * @param ticketNum 本次抢票张数，页面传步进器所选数量；数值必须大于 0 且不超过活动配置的每人每次上限 + * @return Result，code 为 0 表示抢票记录保存成功，data 为 CoffeeTicketRecord；非 0 时 msg 为不可抢票原因 + */ + @At + @Aop(TransAop.READ_COMMITTED) + @RequiresAuthentication + public Result grab(@Param("id") @Valid String id, @Param("ticketNum") Integer ticketNum) { + try { + CoffeeTicketRecord record = coffeeTicketActivityService.grabH5Ticket(id, ticketNum); + return Result.success().addMsg("抢票成功").addData(record); + } catch (IllegalStateException e) { + return Result.error(e.getMessage()); + } + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketMineController.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketMineController.java new file mode 100644 index 0000000..f112384 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/h5controller/H5CoffeeTicketMineController.java @@ -0,0 +1,64 @@ +package io.v.nutz.zhgh.coffeeTicket.h5controller; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.result.Result; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketRecordService; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.apache.shiro.authz.annotation.RequiresPermissions; + +import javax.validation.Valid; + +@IocBean +@At("/platform/h5/coffeeTicket/mine") +@Ok("json:full") +public class H5CoffeeTicketMineController { + + @Inject + private CoffeeTicketRecordService coffeeTicketRecordService; + + /** + * 打开移动端“我的咖啡票”页面。 + */ + @At("") + @Ok("beetl:/mobile/coffeeTicket/mine/index.html") + @RequiresAuthentication + public void index() { + } + + /** + * 手机端我的抢票列表。 + * + * @param pageForm 分页参数，searchKeyword 可传活动标题关键字 + * @return Result，data 为 Pagination，list 为 CoffeeTicketMineListVO，按抢票时间倒序排列 + */ + @At + @RequiresAuthentication + public Result pageData(@Valid PageForm pageForm) { + return Result.success(coffeeTicketRecordService.h5MinePageData(pageForm)); + } + + /** + * 手机端取消抢票。 + * + * @param recordId 抢票记录ID + * @return Result，code 为 0 表示取消成功 + */ + @At("/cancel") + @RequiresAuthentication + @Aop(TransAop.READ_COMMITTED) + public Result cancel(@Param("recordId") @Valid String recordId) { + try { + coffeeTicketRecordService.cancelH5Ticket(recordId); + return Result.success().addMsg("取消成功"); + } catch (IllegalStateException e) { + return Result.error(e.getMessage()); + } + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketActivity.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketActivity.java new file mode 100644 index 0000000..ba64694 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketActivity.java @@ -0,0 +1,131 @@ +package io.v.nutz.zhgh.coffeeTicket.models; + +import io.v.nutz.base.model.BaseModel; +import io.v.nutz.sys.models.Sys_home_activity; +import io.v.nutz.sys.services.SysHomeConvert; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.ColDefine; +import org.nutz.dao.entity.annotation.ColType; +import org.nutz.dao.entity.annotation.Column; +import org.nutz.dao.entity.annotation.Comment; +import org.nutz.dao.entity.annotation.Default; +import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.Table; +import org.nutz.dao.entity.annotation.TableMeta; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("coffee_ticket_activity") +@TableMeta("{'mysql-charset':'utf8mb4'}") +@Comment("咖啡抢票活动表") +public class CoffeeTicketActivity extends BaseModel implements Serializable, SysHomeConvert { + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("活动标题") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String title; + + @Column + @Comment("活动封面") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String cover; + + @Column + @Comment("活动描述") + @ColDefine(type = ColType.TEXT) + private String description; + + @Column + @Comment("活动开始日期") + @ColDefine(type = ColType.DATE) + private Date activityStartDate; + + @Column + @Comment("活动结束日期") + @ColDefine(type = ColType.DATE) + private Date activityEndDate; + + @Column + @Comment("可预约星期，保存周一至周日对应的1-7") + @ColDefine(type = ColType.MYSQL_JSON) + private List weekDays; + + @Column + @Comment("活动总票数") + @ColDefine(type = ColType.INT) + private Integer ticketCount; + + @Column + @Comment("每人每次可抢票数") + @Default("1") + @ColDefine(type = ColType.INT) + private Integer perUserTicketNum; + + @Column + @Comment("每日可预约开始时间") + @ColDefine(type = ColType.VARCHAR, width = 5) + private String reserveStartTime; + + @Column + @Comment("每日可预约结束时间") + @ColDefine(type = ColType.VARCHAR, width = 5) + private String reserveEndTime; + + @Column + @Comment("预约方式：WEEKLY每周固定，SPECIAL特殊日期") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String reserveMode; + + @Column + @Comment("可报名人员范围分组ID，对应 activity_user_scope.groupId") + @ColDefine(type = ColType.INT, width = 32) + private Integer activityGroupId; + + @Column + @Comment("是否开启，开启后手机端可报名并推送首页") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean enabled; + + @Column + @Comment("活动地点") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String address; + + @Column + @Comment("参与须知") + @ColDefine(type = ColType.TEXT) + private String notice; + + /** + * 将咖啡票活动转换为目标项目首页活动数据，供开启活动时同步移动端入口。 + * + * @return Sys_home_activity，包含标题、封面、PC/H5 跳转地址、活动周期和人员范围 + */ + @Override + public Sys_home_activity covertToSysHomeActivity() { + Sys_home_activity sysHomeActivity = new Sys_home_activity(); + sysHomeActivity.setId(this.getId()); + sysHomeActivity.setName(this.getTitle()); + sysHomeActivity.setCover(this.getCover()); + sysHomeActivity.setUrl("/platform/coffeeTicket/activity"); + sysHomeActivity.setH5Url("/platform/h5/coffeeTicket/detail?id=" + this.getId()); + sysHomeActivity.setStartDate(this.getActivityStartDate()); + sysHomeActivity.setEndDate(this.getActivityEndDate()); + sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); + sysHomeActivity.setEnable(Boolean.TRUE.equals(this.getEnabled())); + sysHomeActivity.setClassPath(this.getClass().getName()); + return sysHomeActivity; + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketRecord.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketRecord.java new file mode 100644 index 0000000..68a4c70 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/models/CoffeeTicketRecord.java @@ -0,0 +1,74 @@ +package io.v.nutz.zhgh.coffeeTicket.models; + +import io.v.nutz.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.ColDefine; +import org.nutz.dao.entity.annotation.ColType; +import org.nutz.dao.entity.annotation.Column; +import org.nutz.dao.entity.annotation.Comment; +import org.nutz.dao.entity.annotation.Index; +import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.Table; +import org.nutz.dao.entity.annotation.TableIndexes; +import org.nutz.dao.entity.annotation.TableMeta; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.io.Serializable; +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("coffee_ticket_record") +@TableIndexes({ + @Index(name = "UK_COFFEE_TICKET_RECORD_ACTIVITY_USER", fields = {"activityId", "userId"}, unique = true) +}) +@TableMeta("{'mysql-charset':'utf8mb4'}") +@Comment("咖啡抢票记录表") +public class CoffeeTicketRecord extends BaseModel implements Serializable { + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("活动ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String activityId; + + @Column + @Comment("活动标题") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String activityTitle; + + @Column + @Comment("抢票张数") + @ColDefine(type = ColType.INT) + private Integer ticketNum; + + @Column + @Comment("抢票时间") + @ColDefine(type = ColType.DATETIME) + private Date grabTime; + + @Column + @Comment("用户ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("姓名") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String userName; + + @Column + @Comment("工号") + @ColDefine(type = ColType.VARCHAR, width = 120) + private String loginName; + + @Column + @Comment("状态：SUCCESS已抢票") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String status; +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketActivityService.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketActivityService.java new file mode 100644 index 0000000..e13c9b8 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketActivityService.java @@ -0,0 +1,79 @@ +package io.v.nutz.zhgh.coffeeTicket.service; + +import io.v.nutz.base.service.BaseService; +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketRecord; + +import java.util.List; + +public interface CoffeeTicketActivityService extends BaseService { + + /** + * 保存咖啡抢票活动基础配置。 + * + * @param activity 页面提交的活动配置，包含标题、封面、活动日期、预约星期、活动总票数、每人每次可抢票数、每日预约时间段、地点和须知等内容 + * @return CoffeeTicketActivity 保存后的活动实体，新增时会带有生成后的活动ID + */ + CoffeeTicketActivity saveActivity(CoffeeTicketActivity activity); + + /** + * 删除咖啡抢票活动及其基础配置。 + * + * @param id 活动ID + */ + void deleteActivity(String id); + + /** + * 开启或关闭咖啡抢票活动，并同步移动端首页入口。 + * + * @param id 活动ID + * @param enabled true 表示开启报名并推送首页，false 表示关闭报名并移除首页入口 + */ + void updateEnabled(String id, Boolean enabled); + + /** + * 手机端分页查询可展示的咖啡抢票活动。 + * + * @param pageForm 分页参数，searchKeyword 可传活动标题或活动地点关键字 + * @param status 活动状态，all全部、active报名中、upcoming即将开始、ended已结束 + * @return Pagination，list 为 CoffeeTicketActivity 活动实体列表 + */ + Pagination h5PageData(PageForm pageForm, String status); + + /** + * 查询统计页面年度活动下拉列表。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时返回全部咖啡抢票活动 + * @return List，按活动开始日期倒序排列 + */ + List statisticsActivityList(Integer year); + + /** + * 校验手机端抢票请求是否符合活动开放规则。 + * + * @param id 活动ID，必须传 coffee_ticket_activity 表中的活动主键 + * @param ticketNum 本次抢票张数，手机端传步进器所选数量，用于校验不超过活动配置的每人每次上限且活动余票充足 + * @return String，返回 null 表示校验通过；返回非空字符串表示不可抢票的具体原因 + */ + String checkH5GrabTicket(String id, Integer ticketNum); + + /** + * 校验当前用户是否在活动可报名人员范围内。 + * + * @param activity 活动实体，必须包含 activityGroupId + * @param userId 当前登录用户ID + * @return String，返回 null 表示在范围内；返回非空字符串表示不可参与原因 + */ + String checkH5ActivityUserScope(CoffeeTicketActivity activity, String userId); + + /** + * 手机端立即抢票并保存抢票记录。 + * + * @param id 活动ID，必须传 coffee_ticket_activity 表中的活动主键 + * @param ticketNum 本次抢票张数，手机端传步进器所选数量，必须大于 0 且不超过每人每次上限 + * @return CoffeeTicketRecord，返回保存后的抢票记录；同一活动会先锁定活动数据行，再校验余票并保存，失败时抛出 IllegalStateException + */ + CoffeeTicketRecord grabH5Ticket(String id, Integer ticketNum); +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketRecordService.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketRecordService.java new file mode 100644 index 0000000..7e47680 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/CoffeeTicketRecordService.java @@ -0,0 +1,117 @@ +package io.v.nutz.zhgh.coffeeTicket.service; + +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.BaseService; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketRecord; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketGrabStatisticsVO; + +import java.util.List; + +public interface CoffeeTicketRecordService extends BaseService { + + /** + * 统计指定活动已经占用的票数。 + * + * @param activityId 活动ID，必须传 coffee_ticket_activity 表中的活动主键 + * @return int，返回 coffee_ticket_record 中该活动 ticketNum 的合计值，无记录时返回 0 + */ + int countGrabbedTicketNum(String activityId); + + /** + * 判断用户是否已经抢过指定活动的票。 + * + * @param activityId 活动ID + * @param userId 当前登录用户ID + * @return boolean，true 表示该用户已有该活动抢票记录 + */ + boolean hasUserGrabbed(String activityId, String userId); + + /** + * 查询用户在指定活动下最近一次抢票记录。 + * + * @param activityId 活动ID + * @param userId 当前登录用户ID + * @return CoffeeTicketRecord，返回最近一次抢票记录；没有记录时返回 null + */ + CoffeeTicketRecord fetchLatestUserRecord(String activityId, String userId); + + /** + * 统计用户在指定活动下已抢票数。 + * + * @param activityId 活动ID + * @param userId 当前登录用户ID + * @return int，返回该用户在当前活动下 ticketNum 的合计值，无记录时返回 0 + */ + int countUserTicketNum(String activityId, String userId); + + /** + * 保存手机端抢票记录。 + * + * @param activity 已通过规则校验的活动实体，用于回填活动ID和标题 + * @param ticketNum 本次抢票张数，当前 H5 详情页默认传 1 + * @return CoffeeTicketRecord，返回已经写入数据库的抢票记录实体 + */ + CoffeeTicketRecord saveGrabRecord(CoffeeTicketActivity activity, Integer ticketNum); + + /** + * 手机端分页查询当前用户的抢票记录。 + * + * @param pageForm 分页参数，searchKeyword 可传活动标题关键字 + * @return Pagination，list 为 CoffeeTicketMineListVO，按抢票时间倒序排列 + */ + Pagination h5MinePageData(PageForm pageForm); + + /** + * PC端分页查询咖啡抢票统计明细。 + * + * @param pageForm 分页参数，包含 pageNumber、pageSize、排序字段等公共分页信息 + * @param year 活动开始日期所属年度，传 yyyy 年份；为空且 activityId 为空时查询全部记录 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @param grabDate 抢票日期，传 yyyy-MM-dd；为空时不按实际抢票日期筛选 + * @return Pagination，list 为 CoffeeTicketGrabStatisticsVO，展示用户、活动、票数和抢票时间 + */ + Pagination statisticsPageData(PageForm pageForm, Integer year, String activityId, String unionId, String unitId, String grabDate); + + /** + * 查询当前统计条件下的全部抢票明细，用于按页面筛选条件导出。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时不按年度筛选 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @param grabDate 抢票日期，传 yyyy-MM-dd；为空时不按实际抢票日期筛选 + * @return List，返回与统计列表字段一致的全部匹配数据 + */ + List statisticsExportList(Integer year, String activityId, String unionId, String unitId, String grabDate); + + /** + * 查询当前统计条件下存在抢票记录的日期。 + * + * @param year 活动开始日期所属年度，传 yyyy 年份；为空时不按年度筛选 + * @param activityId 活动ID，传 coffee_ticket_activity 表主键；为空时按年度查询多个活动 + * @param unionId 抢票用户所属工会ID，传 user.unionid；为空时不按工会筛选 + * @param unitId 抢票用户所属单位ID，传 user.unitid；为空时不按单位筛选 + * @return List，返回 yyyy-MM-dd 格式的实际抢票日期列表，前端据此控制日期选择器可选范围 + */ + List statisticsGrabDateList(Integer year, String activityId, String unionId, String unitId); + + /** + * PC端统计页面删除一条抢票记录。 + * + * @param recordId 抢票记录ID，必须传 coffee_ticket_record 表中的记录主键 + * @return void，成功则删除该条抢票记录 + */ + void deleteStatisticsRecord(String recordId); + + /** + * 手机端取消一条抢票记录。 + * + * @param recordId 要取消的抢票记录ID + * @return void，成功则直接删除该条抢票记录 + */ + void cancelH5Ticket(String recordId); +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketActivityServiceImpl.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketActivityServiceImpl.java new file mode 100644 index 0000000..0ffbd9f --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketActivityServiceImpl.java @@ -0,0 +1,348 @@ +package io.v.nutz.zhgh.coffeeTicket.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.BaseServiceImpl; +import io.v.nutz.sys.models.Sys_home_activity; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketRecord; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketActivityService; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketRecordService; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketActivityH5ListVO; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.DaoException; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@IocBean(args = {"refer:dao"}) +public class CoffeeTicketActivityServiceImpl extends BaseServiceImpl implements CoffeeTicketActivityService { + + @Inject + private CoffeeTicketRecordService coffeeTicketRecordService; + + public CoffeeTicketActivityServiceImpl(Dao dao) { + super(dao); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public CoffeeTicketActivity saveActivity(CoffeeTicketActivity activity) { + if (activity.getActivityGroupId() == null + || dao().count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getActivityGroupId())) == 0) { + throw new IllegalStateException("请选择有效的可报名人员范围"); + } + if (activity.getEnabled() == null) { + activity.setEnabled(false); + } + if (activity.getPerUserTicketNum() == null) { + activity.setPerUserTicketNum(1); + } + dao().insertOrUpdate(activity); + syncHomeActivity(activity); + return activity; + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public void deleteActivity(String id) { + dao().delete(CoffeeTicketActivity.class, id); + dao().delete(Sys_home_activity.class, id); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public void updateEnabled(String id, Boolean enabled) { + CoffeeTicketActivity activity = fetch(id); + if (activity == null) { + throw new IllegalStateException("活动不存在"); + } + activity.setEnabled(Boolean.TRUE.equals(enabled)); + dao().updateIgnoreNull(activity); + syncHomeActivity(activity); + } + + @Override + public Pagination h5PageData(PageForm pageForm, String status) { + Cnd cnd = Cnd.NEW(); + cnd.and("enabled", "=", true); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + String keyword = "%" + pageForm.getSearchKeyword() + "%"; + cnd.and(Cnd.exps("title", "like", keyword).or("address", "like", keyword)); + } + Date todayStart = DateUtil.beginOfDay(new Date()); + Date todayEnd = DateUtil.endOfDay(new Date()); + if ("active".equals(status)) { + cnd.and("activityStartDate", "<=", todayEnd); + cnd.and("activityEndDate", ">=", todayStart); + } else if ("upcoming".equals(status)) { + cnd.and("activityStartDate", ">", todayEnd); + } else if ("ended".equals(status)) { + cnd.and("activityEndDate", "<", todayStart); + } + List visibleGroupIds = buildCurrentUserVisibleGroupIds(cnd); + if (visibleGroupIds.isEmpty()) { + cnd.and("id", "=", "__none__"); + } else { + cnd.and("activityGroupId", "in", visibleGroupIds); + } + cnd.desc("activityStartDate"); + Pagination pagination = listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); + List activityList = pagination.getList(CoffeeTicketActivity.class); + List voList = activityList.stream().map(this::buildH5ListVO).collect(Collectors.toList()); + pagination.setList(voList); + return pagination; + } + + @Override + public List statisticsActivityList(Integer year) { + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(activityStartDate)", "=", year); + cnd.desc("activityStartDate"); + return dao().query(CoffeeTicketActivity.class, cnd); + } + + @Override + public String checkH5GrabTicket(String id, Integer ticketNum) { + if (StrUtil.isBlank(id)) { + return "活动ID不能为空"; + } + CoffeeTicketActivity activity = fetch(id); + if (activity == null) { + return "活动不存在"; + } + int currentTicketNum = ticketNum == null ? getPerUserTicketNum(activity) : ticketNum; + if (currentTicketNum <= 0) { + return "抢票张数必须大于0"; + } + if (!Boolean.TRUE.equals(activity.getEnabled())) { + return "活动未开启"; + } + String scopeMsg = checkH5ActivityUserScope(activity, ShiroUtil.getUserId()); + if (scopeMsg != null) { + return scopeMsg; + } + Date now = new Date(); + if (activity.getActivityStartDate() == null || activity.getActivityEndDate() == null) { + return "活动周期未配置"; + } + if (now.before(DateUtil.beginOfDay(activity.getActivityStartDate()))) { + return "活动尚未开始"; + } + if (now.after(DateUtil.endOfDay(activity.getActivityEndDate()))) { + return "活动已结束"; + } + List weekDays = activity.getWeekDays(); + if (weekDays == null || weekDays.isEmpty()) { + return "活动未配置可预约星期"; + } + if (!weekDays.contains(getTodayWeekValue(now))) { + return "今天不在可预约星期范围内"; + } + if (StrUtil.isBlank(activity.getReserveStartTime()) || StrUtil.isBlank(activity.getReserveEndTime())) { + return "活动未配置每日可预约时间段"; + } + String currentTime = DateUtil.format(now, "HH:mm"); + if (currentTime.compareTo(activity.getReserveStartTime()) < 0 || currentTime.compareTo(activity.getReserveEndTime()) > 0) { + return "当前不在时间段内"; + } + if (activity.getTicketCount() == null || activity.getTicketCount() <= 0) { + return "活动票数不足"; + } + if (currentTicketNum > getPerUserTicketNum(activity)) { + return "本次抢票张数超过每人每次可抢票数"; + } + return null; + } + + @Override + public String checkH5ActivityUserScope(CoffeeTicketActivity activity, String userId) { + if (activity == null) { + return "活动不存在"; + } + if (activity.getActivityGroupId() == null) { + return "活动未配置可报名人员范围"; + } + int scopeUserCount = dao().count(ActivityUserScope.class, + Cnd.where("groupId", "=", activity.getActivityGroupId()).and("userId", "=", userId)); + if (scopeUserCount == 0) { + return "您不在本活动可报名人员范围内"; + } + return null; + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public CoffeeTicketRecord grabH5Ticket(String id, Integer ticketNum) { + if (StrUtil.isBlank(id)) { + throw new IllegalStateException("活动ID不能为空"); + } + try { + lockActivity(id); + String errorMsg = checkH5GrabTicket(id, ticketNum); + if (errorMsg != null) { + throw new IllegalStateException(errorMsg); + } + CoffeeTicketActivity activity = fetch(id); + int currentTicketNum = ticketNum == null ? getPerUserTicketNum(activity) : ticketNum; + if (coffeeTicketRecordService.hasUserGrabbed(activity.getId(), ShiroUtil.getUserId())) { + throw new IllegalStateException("您已抢过该活动票"); + } + int grabbedTicketNum = coffeeTicketRecordService.countGrabbedTicketNum(activity.getId()); + int remainingTicketNum = activity.getTicketCount() - grabbedTicketNum; + if (remainingTicketNum < currentTicketNum) { + throw new IllegalStateException("票数不足"); + } + return coffeeTicketRecordService.saveGrabRecord(activity, currentTicketNum); + } catch (DaoException e) { + if (isDuplicateGrabException(e)) { + throw new IllegalStateException("您已抢过该活动票"); + } + if (isGrabLockException(e)) { + throw new IllegalStateException("当前抢票人数较多，请稍后重试"); + } + throw e; + } + } + + /** + * 在当前抢票事务中锁定活动主键对应的数据行，保证同一活动的余票统计和记录保存串行执行。 + * + * @param id 活动ID，必须传 coffee_ticket_activity 表主键 + */ + private void lockActivity(String id) { + Sql lockSql = Sqls.fetchRecord("SELECT id FROM coffee_ticket_activity WHERE id = @id FOR UPDATE") + .setParam("id", id); + dao().execute(lockSql); + if (lockSql.getResult() == null) { + throw new IllegalStateException("活动不存在"); + } + } + + /** + * 组装手机端列表展示对象，补齐活动总票数、已抢票数和剩余票数字段。 + * + * @param activity 当前页活动实体 + * @return CoffeeTicketActivityH5ListVO，包含活动基础字段和票数统计字段 + */ + private CoffeeTicketActivityH5ListVO buildH5ListVO(CoffeeTicketActivity activity) { + CoffeeTicketActivityH5ListVO vo = BeanUtil.copyProperties(activity, CoffeeTicketActivityH5ListVO.class); + int totalTicketNum = activity.getTicketCount() == null ? 0 : activity.getTicketCount(); + int grabbedTicketNum = coffeeTicketRecordService.countGrabbedTicketNum(activity.getId()); + vo.setTotalTicketNum(totalTicketNum); + vo.setGrabbedTicketNum(grabbedTicketNum); + vo.setRemainingTicketNum(Math.max(totalTicketNum - grabbedTicketNum, 0)); + return vo; + } + + /** + * 读取活动的单人单次抢票数量；历史活动尚未配置该字段时按 1 张兼容。 + * + * @param activity 当前抢票活动 + * @return int 每人每次可抢票数，最小为 1 + */ + private int getPerUserTicketNum(CoffeeTicketActivity activity) { + if (activity == null || activity.getPerUserTicketNum() == null || activity.getPerUserTicketNum() <= 0) { + return 1; + } + return activity.getPerUserTicketNum(); + } + + /** + * 按当前查询条件先收集活动分组，再使用目标项目已落库的活动人员范围过滤当前用户可参与的分组。 + * + * @param cnd H5列表搜索条件，包含关键字和活动状态筛选 + * @return List，当前登录用户在人员范围内的活动分组ID列表 + */ + private List buildCurrentUserVisibleGroupIds(Cnd cnd) { + List groupIds = dao().query(CoffeeTicketActivity.class, cnd) + .stream() + .map(CoffeeTicketActivity::getActivityGroupId) + .filter(groupId -> groupId != null) + .distinct() + .collect(Collectors.toList()); + if (groupIds.isEmpty()) { + return List.of(); + } + return dao().query(ActivityUserScope.class, + Cnd.where("groupId", "in", groupIds).and("userId", "=", ShiroUtil.getUserId())) + .stream() + .map(ActivityUserScope::getGroupId) + .distinct() + .collect(Collectors.toList()); + } + + /** + * 同步移动端首页入口。活动开启时写入首页，关闭时删除首页入口。 + * + * @param activity 咖啡抢票活动，包含首页展示和跳转所需字段 + */ + private void syncHomeActivity(CoffeeTicketActivity activity) { + if (Boolean.TRUE.equals(activity.getEnabled())) { + dao().insertOrUpdate(activity.covertToSysHomeActivity()); + return; + } + dao().delete(Sys_home_activity.class, activity.getId()); + } + + /** + * 将 Java 星期值转换为页面保存的 1-7 格式，其中 1 表示周一、7 表示周日。 + * + * @param date 需要判断星期的日期 + * @return String，返回当前日期对应的星期配置值 + */ + private String getTodayWeekValue(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); + if (dayOfWeek == Calendar.SUNDAY) { + return "7"; + } + return String.valueOf(dayOfWeek - 1); + } + + /** + * 数据库唯一索引用于兜底防止同一用户并发重复抢同一活动。 + * + * @param e 抢票记录插入时抛出的数据库异常 + * @return boolean，true 表示命中 activityId + userId 唯一约束 + */ + private boolean isDuplicateGrabException(DaoException e) { + String message = e.getMessage(); + return StrUtil.containsIgnoreCase(message, "Duplicate") + || StrUtil.containsIgnoreCase(message, "UK_COFFEE_TICKET_RECORD_ACTIVITY_USER"); + } + + /** + * 判断数据库异常是否由行锁等待超时或死锁引起，用于向手机端返回可理解的重试提示。 + * + * @param e 抢票事务执行期间产生的数据库异常 + * @return boolean，true 表示当前请求应提示用户稍后重试 + */ + private boolean isGrabLockException(DaoException e) { + Throwable cause = e; + while (cause != null) { + String message = cause.getMessage(); + if (StrUtil.containsIgnoreCase(message, "Lock wait timeout") + || StrUtil.containsIgnoreCase(message, "Deadlock found")) { + return true; + } + cause = cause.getCause(); + } + return false; + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketRecordServiceImpl.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketRecordServiceImpl.java new file mode 100644 index 0000000..0114872 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/service/impl/CoffeeTicketRecordServiceImpl.java @@ -0,0 +1,296 @@ +package io.v.nutz.zhgh.coffeeTicket.service.impl; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.date.DatePattern; +import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.BaseServiceImpl; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketRecord; +import io.v.nutz.zhgh.coffeeTicket.service.CoffeeTicketRecordService; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketGrabStatisticsVO; +import io.v.nutz.zhgh.coffeeTicket.vo.CoffeeTicketMineListVO; +import cn.hutool.core.date.DateUtil; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; + +import java.util.Calendar; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@IocBean(args = {"refer:dao"}) +public class CoffeeTicketRecordServiceImpl extends BaseServiceImpl implements CoffeeTicketRecordService { + + public CoffeeTicketRecordServiceImpl(Dao dao) { + super(dao); + } + + @Override + public int countGrabbedTicketNum(String activityId) { + return dao().func(CoffeeTicketRecord.class, "sum", "ticketNum", Cnd.where("activityId", "=", activityId)); + } + + @Override + public boolean hasUserGrabbed(String activityId, String userId) { + return dao().count(CoffeeTicketRecord.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId)) > 0; + } + + @Override + public CoffeeTicketRecord fetchLatestUserRecord(String activityId, String userId) { + Cnd cnd = Cnd.where("activityId", "=", activityId).and("userId", "=", userId); + cnd.desc("grabTime"); + return dao().fetch(CoffeeTicketRecord.class, cnd); + } + + @Override + public int countUserTicketNum(String activityId, String userId) { + return dao().func(CoffeeTicketRecord.class, "sum", "ticketNum", Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public CoffeeTicketRecord saveGrabRecord(CoffeeTicketActivity activity, Integer ticketNum) { + CoffeeTicketRecord record = new CoffeeTicketRecord(); + record.setActivityId(activity.getId()); + record.setActivityTitle(activity.getTitle()); + record.setTicketNum(ticketNum); + record.setGrabTime(new Date()); + record.setUserId(ShiroUtil.getUserId()); + record.setUserName(ShiroUtil.getPlatformUsername()); + record.setLoginName(ShiroUtil.getPlatformLoginname()); + record.setStatus("SUCCESS"); + return dao().insert(record); + } + + @Override + public Pagination h5MinePageData(PageForm pageForm) { + Cnd cnd = Cnd.where("userId", "=", ShiroUtil.getUserId()); + cnd.desc("grabTime"); + List recordList = dao().query(CoffeeTicketRecord.class, cnd); + List voList = recordList.stream().map(this::buildMineListVO).filter(item -> matchKeyword(item, pageForm.getSearchKeyword())).collect(Collectors.toList()); + int totalCount = voList.size(); + int fromIndex = Math.min((pageForm.getPageNumber() - 1) * pageForm.getPageSize(), totalCount); + int toIndex = Math.min(fromIndex + pageForm.getPageSize(), totalCount); + return new Pagination(pageForm.getPageNumber(), pageForm.getPageSize(), totalCount, new ArrayList<>(voList.subList(fromIndex, toIndex))); + } + + @Override + public Pagination statisticsPageData(PageForm pageForm, Integer year, String activityId, String unionId, String unitId, String grabDate) { + Sql sql = buildStatisticsSql(year, activityId, unionId, unitId, grabDate); + Pagination pagination = listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + List recordList = pagination.getList(); + List voList = recordList.stream().map(this::buildGrabStatisticsVO).collect(Collectors.toList()); + pagination.setList(voList); + return pagination; + } + + @Override + public List statisticsExportList(Integer year, String activityId, String unionId, String unitId, String grabDate) { + Sql sql = buildStatisticsSql(year, activityId, unionId, unitId, grabDate); + return listMap(sql).stream().map(this::buildGrabStatisticsVO).collect(Collectors.toList()); + } + + @Override + public List statisticsGrabDateList(Integer year, String activityId, String unionId, String unitId) { + Sql sql = Sqls.create(""" + SELECT + DATE_FORMAT(r.grabTime, '%Y-%m-%d') AS grabDate + FROM + coffee_ticket_record r + LEFT JOIN `user` u ON u.id = r.userId + LEFT JOIN coffee_ticket_activity a ON a.id = r.activityId + $condition + GROUP BY DATE_FORMAT(r.grabTime, '%Y-%m-%d') + ORDER BY grabDate DESC + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("r.activityId", "=", activityId); + cnd.andEX("YEAR(a.activityStartDate)", "=", year); + cnd.andEX("u.unionid", "=", unionId); + cnd.andEX("u.unitid", "=", unitId); + sql.setCondition(cnd); + List list = listMap(sql); + return list.stream().map(item -> item.getString("grabDate")).collect(Collectors.toList()); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public void deleteStatisticsRecord(String recordId) { + if (StrUtil.isBlank(recordId)) { + throw new IllegalStateException("抢票记录ID不能为空"); + } + CoffeeTicketRecord record = fetch(recordId); + if (record == null) { + throw new IllegalStateException("抢票记录不存在"); + } + dao().delete(record); + } + + @Override + @Aop(TransAop.READ_COMMITTED) + public void cancelH5Ticket(String recordId) { + if (StrUtil.isBlank(recordId)) { + throw new IllegalStateException("抢票记录ID不能为空"); + } + CoffeeTicketRecord record = fetch(recordId); + if (record == null) { + throw new IllegalStateException("抢票记录不存在"); + } + if (!ShiroUtil.getUserId().equals(record.getUserId())) { + throw new IllegalStateException("无权取消该抢票记录"); + } + CoffeeTicketActivity activity = dao().fetch(CoffeeTicketActivity.class, record.getActivityId()); + if (activity == null) { + throw new IllegalStateException("活动不存在"); + } + if (!isWithinGrabWindow(activity)) { + throw new IllegalStateException("当前不在可取消时间内"); + } + dao().delete(record); + } + + /** + * 将抢票记录和活动信息组合成手机端“我的抢票”卡片数据。 + * + * @param record 当前用户的一条抢票记录 + * @return CoffeeTicketMineListVO，包含记录字段和活动字段 + */ + private CoffeeTicketMineListVO buildMineListVO(CoffeeTicketRecord record) { + CoffeeTicketActivity activity = dao().fetch(CoffeeTicketActivity.class, record.getActivityId()); + CoffeeTicketMineListVO vo = new CoffeeTicketMineListVO(); + vo.setRecordId(record.getId()); + vo.setActivityId(record.getActivityId()); + vo.setTitle(activity == null ? record.getActivityTitle() : activity.getTitle()); + vo.setCover(activity == null ? null : activity.getCover()); + vo.setDescription(activity == null ? null : activity.getDescription()); + vo.setActivityStartDate(activity == null ? null : activity.getActivityStartDate()); + vo.setActivityEndDate(activity == null ? null : activity.getActivityEndDate()); + vo.setReserveStartTime(activity == null ? null : activity.getReserveStartTime()); + vo.setReserveEndTime(activity == null ? null : activity.getReserveEndTime()); + vo.setAddress(activity == null ? null : activity.getAddress()); + vo.setTicketNum(record.getTicketNum()); + vo.setGrabTime(record.getGrabTime()); + vo.setCanCancel(activity != null && isWithinGrabWindow(activity)); + return vo; + } + + /** + * 组装PC端抢票统计明细，保留记录表中的用户、活动、票数和实际抢票时间。 + * + * @param record 当前页的一条抢票记录 + * @return CoffeeTicketGrabStatisticsVO，返回给统计页面展示的明细数据 + */ + private CoffeeTicketGrabStatisticsVO buildGrabStatisticsVO(NutMap record) { + CoffeeTicketGrabStatisticsVO vo = new CoffeeTicketGrabStatisticsVO(); + vo.setRecordId(record.getString("recordId")); + vo.setActivityId(record.getString("activityId")); + vo.setActivityTitle(record.getString("activityTitle")); + vo.setUserId(record.getString("userId")); + vo.setUserName(record.getString("userName")); + vo.setLoginName(record.getString("loginName")); + vo.setUnitId(record.getString("unitId")); + vo.setUnitName(record.getString("unitName")); + vo.setUnionId(record.getString("unionId")); + vo.setUnionName(record.getString("unionName")); + vo.setTicketNum(record.getInt("ticketNum")); + vo.setGrabTime(record.getAs("grabTime", Date.class)); + return vo; + } + + /** + * 构建PC端抢票统计查询SQL，分页列表和导出共用同一套筛选条件，避免页面展示与导出结果不一致。 + * + * @param year 活动开始日期所属年度 + * @param activityId 活动ID + * @param unionId 抢票用户所属工会ID + * @param unitId 抢票用户所属单位ID + * @param grabDate 实际抢票日期，格式 yyyy-MM-dd + * @return Sql，已带查询条件和按抢票时间倒序排序 + */ + private Sql buildStatisticsSql(Integer year, String activityId, String unionId, String unitId, String grabDate) { + Sql sql = Sqls.create(""" + SELECT + r.id AS recordId, + r.activityId, + r.activityTitle, + r.userId, + r.userName, + r.loginName, + u.unitid AS unitId, + u.unitname AS unitName, + u.unionid AS unionId, + u.unionname AS unionName, + r.ticketNum, + r.grabTime + FROM + coffee_ticket_record r + LEFT JOIN `user` u ON u.id = r.userId + LEFT JOIN coffee_ticket_activity a ON a.id = r.activityId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("r.activityId", "=", activityId); + cnd.andEX("YEAR(a.activityStartDate)", "=", year); + cnd.andEX("u.unionid", "=", unionId); + cnd.andEX("u.unitid", "=", unitId); + if (StrUtil.isNotBlank(grabDate)) { + Date date = DateUtil.parse(grabDate, DatePattern.NORM_DATE_PATTERN); + cnd.and("r.grabTime", ">=", DateUtil.beginOfDay(date)); + cnd.and("r.grabTime", "<=", DateUtil.endOfDay(date)); + } + cnd.desc("r.grabTime"); + sql.setCondition(cnd); + return sql; + } + + private boolean isWithinGrabWindow(CoffeeTicketActivity activity) { + Date now = new Date(); + if (activity.getActivityStartDate() == null || activity.getActivityEndDate() == null) { + return false; + } + if (now.before(DateUtil.beginOfDay(activity.getActivityStartDate()))) { + return false; + } + if (now.after(DateUtil.endOfDay(activity.getActivityEndDate()))) { + return false; + } + List weekDays = activity.getWeekDays(); + if (weekDays == null || weekDays.isEmpty()) { + return false; + } + if (!weekDays.contains(getTodayWeekValue(now))) { + return false; + } + if (StrUtil.isBlank(activity.getReserveStartTime()) || StrUtil.isBlank(activity.getReserveEndTime())) { + return false; + } + String currentTime = DateUtil.format(now, "HH:mm"); + if (currentTime.compareTo(activity.getReserveStartTime()) < 0 || currentTime.compareTo(activity.getReserveEndTime()) > 0) { + return false; + } + return true; + } + + private String getTodayWeekValue(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); + if (dayOfWeek == Calendar.SUNDAY) { + return "7"; + } + return String.valueOf(dayOfWeek - 1); + } + + private boolean matchKeyword(CoffeeTicketMineListVO item, String keyword) { + return StrUtil.isBlank(keyword) || StrUtil.containsIgnoreCase(item.getTitle(), keyword); + } +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5DetailVO.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5DetailVO.java new file mode 100644 index 0000000..3915053 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5DetailVO.java @@ -0,0 +1,28 @@ +package io.v.nutz.zhgh.coffeeTicket.vo; + +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Data +public class CoffeeTicketActivityH5DetailVO extends CoffeeTicketActivity implements Serializable { + + /** + * 当前登录用户是否已经抢过该活动票。 + */ + private Boolean hasGrabbed; + + /** + * 当前登录用户在该活动下已抢票张数合计。 + */ + private Integer myTicketNum; + + /** + * 当前登录用户最近一次抢票时间。 + */ + private Date myGrabTime; +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5ListVO.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5ListVO.java new file mode 100644 index 0000000..df68516 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketActivityH5ListVO.java @@ -0,0 +1,27 @@ +package io.v.nutz.zhgh.coffeeTicket.vo; + +import io.v.nutz.zhgh.coffeeTicket.models.CoffeeTicketActivity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +public class CoffeeTicketActivityH5ListVO extends CoffeeTicketActivity implements Serializable { + + /** + * 活动总票数，当前业务按活动表 ticketCount 字段计算。 + */ + private Integer totalTicketNum; + + /** + * 已抢票数，统计抢票记录表中当前活动 ticketNum 合计。 + */ + private Integer grabbedTicketNum; + + /** + * 剩余票数，按 totalTicketNum - grabbedTicketNum 计算，小于 0 时按 0 返回。 + */ + private Integer remainingTicketNum; +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketGrabStatisticsVO.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketGrabStatisticsVO.java new file mode 100644 index 0000000..07bbe5d --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketGrabStatisticsVO.java @@ -0,0 +1,70 @@ +package io.v.nutz.zhgh.coffeeTicket.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class CoffeeTicketGrabStatisticsVO implements Serializable { + + /** + * 抢票记录ID，用于定位一条用户抢票明细。 + */ + private String recordId; + + /** + * 活动ID，对应 coffee_ticket_activity 表主键。 + */ + private String activityId; + + /** + * 活动标题，优先使用当前活动表标题，活动被删除时使用记录表冗余标题。 + */ + private String activityTitle; + + /** + * 抢票用户ID，对应当前登录用户体系中的用户主键。 + */ + private String userId; + + /** + * 抢票用户姓名，来源于抢票时保存的用户信息。 + */ + private String userName; + + /** + * 抢票用户工号，来源于抢票时保存的登录名。 + */ + private String loginName; + + /** + * 抢票用户所属单位ID，来源于目标项目 user 视图。 + */ + private String unitId; + + /** + * 抢票用户所属单位名称，来源于目标项目 user 视图。 + */ + private String unitName; + + /** + * 抢票用户所属工会ID，来源于目标项目 user 视图。 + */ + private String unionId; + + /** + * 抢票用户所属工会名称，来源于目标项目 user 视图。 + */ + private String unionName; + + /** + * 本次抢票张数。 + */ + private Integer ticketNum; + + /** + * 用户实际点击抢票并生成记录的时间。 + */ + private Date grabTime; +} diff --git a/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketMineListVO.java b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketMineListVO.java new file mode 100644 index 0000000..200a452 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/coffeeTicket/vo/CoffeeTicketMineListVO.java @@ -0,0 +1,24 @@ +package io.v.nutz.zhgh.coffeeTicket.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class CoffeeTicketMineListVO implements Serializable { + + private String recordId; + private String activityId; + private String title; + private String cover; + private String description; + private Date activityStartDate; + private Date activityEndDate; + private String reserveStartTime; + private String reserveEndTime; + private String address; + private Integer ticketNum; + private Date grabTime; + private Boolean canCancel; +} diff --git a/src/main/resources/views/mobile/coffeeTicket/detail/index.html b/src/main/resources/views/mobile/coffeeTicket/detail/index.html new file mode 100644 index 0000000..5cb230a --- /dev/null +++ b/src/main/resources/views/mobile/coffeeTicket/detail/index.html @@ -0,0 +1,618 @@ + + + +
+ + + +
+ +
暂无封面
+
+ +
+
+
+
+
{{formData.title || '--'}}
+
{{statusInfo.text}}
+
+
+
+ +
活动周期
+
{{formatDate(formData.activityStartDate)}} ~ {{formatDate(formData.activityEndDate)}}
+
+
+ +
可抢票星期
+
{{formatWeekDays(formData.weekDays)}}
+
+
+ +
活动总票数
+
{{formData.ticketCount || 0}} 张
+
+ +
+ +
抢票时间段
+
{{formData.reserveStartTime || '--'}} - {{formData.reserveEndTime || '--'}}
+
+
+ +
活动地点
+
{{formData.address || '--'}}
+
+
+ +
我的抢票
+
已抢 {{formData.myTicketNum || 0}} 张
+
+
+
+
+ +
+
+ + 活动描述 +
+
+ {{formData.description || '暂无活动描述'}} +
+ +
+
+
+ + 参与须知 +
+
{{noticeText}}
+
+
+ +
+ +
+
+ 本次抢票 + 每人可抢 {{formData.perUserTicketNum || 1}} 张 +
+ + +
+ + {{formData.hasGrabbed ? '已抢票' : ticketActionInfo.text}} + +
+
+ + + + diff --git a/src/main/resources/views/mobile/coffeeTicket/list/index.html b/src/main/resources/views/mobile/coffeeTicket/list/index.html new file mode 100644 index 0000000..79e281a --- /dev/null +++ b/src/main/resources/views/mobile/coffeeTicket/list/index.html @@ -0,0 +1,402 @@ + + + +
+ + + +
+ + +
+
+ + + + + + +
+ + + +
+
+
+ +
暂无封面
+
{{getStatusInfo(item).text}}
+
+
+
{{item.title}}
+
+
+ + 活动时间 + {{formatDate(item.activityStartDate)}} 至 {{formatDate(item.activityEndDate)}} +
+
+ + 可抢票 + + {{weekMap[week] || week}} + + -- +
+
+ + 抢票时间 + {{item.reserveStartTime || '--'}} - {{item.reserveEndTime || '--'}} +
+
+ + 活动地点 + {{item.address || '--'}} +
+
+
+ 活动总票数 {{item.totalTicketNum || 0}} 张 + 剩余票数 {{item.remainingTicketNum || 0}} 张 +
+ 立即抢票 +
+
+
+ + + + + + 抢票活动 + 我的抢票 + +
+ + + + diff --git a/src/main/resources/views/mobile/coffeeTicket/mine/index.html b/src/main/resources/views/mobile/coffeeTicket/mine/index.html new file mode 100644 index 0000000..d1502e9 --- /dev/null +++ b/src/main/resources/views/mobile/coffeeTicket/mine/index.html @@ -0,0 +1,354 @@ + + + +
+ + + +
+
共 {{pageForm.totalCount || 0}} 张票
+
+ + + +
+
+
+ +
暂无封面
+
+
+
+
{{item.title || '--'}}
+
+
+ + 已抢 {{item.ticketNum || 0}} 张 +
+
+
+ + 活动时间　{{formatDate(item.activityStartDate)}} 至 {{formatDate(item.activityEndDate)}} +
+
+ + 抢票时间　{{formatDateTime(item.grabTime)}} +
+
+ + 活动地点　{{item.address || '--'}} +
+
+
+
+ 取消抢票 + 查看详情 +
+
+
+ + + + + + 抢票活动 + 我的抢票 + +
+ + + + diff --git a/src/main/resources/views/platform/coffeeTicket/activity/index.html b/src/main/resources/views/platform/coffeeTicket/activity/index.html new file mode 100644 index 0000000..bdd793d --- /dev/null +++ b/src/main/resources/views/platform/coffeeTicket/activity/index.html @@ -0,0 +1,203 @@ + + +
+ + +
+
+
年度：
+
+ + +
+
+
+
活动标题：
+
+ + +
+
+
+ 搜索 +
+
+ + + + + + + 新增活动 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/coffeeTicket/new/index.html b/src/main/resources/views/platform/coffeeTicket/new/index.html new file mode 100644 index 0000000..e5cd53d --- /dev/null +++ b/src/main/resources/views/platform/coffeeTicket/new/index.html @@ -0,0 +1,477 @@ + + + + +
+ + +
{{formData.id ? "编辑咖啡抢票活动" : "创建咖啡抢票活动"}}
+ +
+
1
+

基础信息

+ + + + + + + + + + + 移除封面 +
建议尺寸：750*422px，支持 jpg、png 格式，大小不超过 2MB
+ + + + + + +
+ +
+
2
+

活动时间与频次

+ + + +
设置活动整体的开始和结束时间
+ + + + + + {{item.label}} + + +
设置每周哪些天可以预约（可多选）
+ +
+ +
+
3
+

抢票规则

+ +
+ + 张 + 活动可供抢购的总票数 +
+ + + +
+ + 张 + 默认 1 张，用户每次抢票将按此数量领取 +
+ + + + + + +
只有该人员范围内的用户可以在手机端看到并参与本活动
+ + + +
+ + + + + - + + + + + 在该时间段内可预约，可自行调整 +
+ +
+ +
+
4
+

其他设置

+ + + + + + + + + +
+ +
+ 取消 + 保存 +
+ + +
+ + + + diff --git a/src/main/resources/views/platform/coffeeTicket/statistics/index.html b/src/main/resources/views/platform/coffeeTicket/statistics/index.html new file mode 100644 index 0000000..dd9febe --- /dev/null +++ b/src/main/resources/views/platform/coffeeTicket/statistics/index.html @@ -0,0 +1,274 @@ + + +
+ + +
+
+
年度：
+
+ + +
+
+
+
活动名称：
+
+ + + + + +
+
+
+
抢票日期：
+
+ + +
+
+
+
所属工会：
+
+ + + + +
+
+
+
所属单位：
+
+ + + + +
+
+
+ 搜索 +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +