From c628789322c9f09c60eb8fbb8d4aee7fe47f73ab Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Sun, 19 May 2024 20:00:19 +0800 Subject: [PATCH] =?UTF-8?q?202404=20=E8=B6=B3=E7=90=83=E5=85=A5=E5=9C=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/api/MemberLessonTicketDetailDTO.java | 13 +++- .../com/sv/dto/api/MemberTicketEnterDTO.java | 61 ++++++++++++++++--- .../com/sv/entity/MemberTicketInvite.java | 5 +- other/sql/202404.sql | 2 +- .../sv/mapper/MemberLessonTicketMapper.java | 1 + .../java/com/sv/mapper/VenueLessonMapper.java | 1 + .../service/api/MemberTicketEnterService.java | 25 +------- .../mapper/sv/MemberLessonTicketMapper.xml | 1 + .../mapper/sv/MemberTicketInviteMapper.xml | 24 ++++---- 9 files changed, 85 insertions(+), 48 deletions(-) diff --git a/entity/src/main/java/com/sv/dto/api/MemberLessonTicketDetailDTO.java b/entity/src/main/java/com/sv/dto/api/MemberLessonTicketDetailDTO.java index 7dcec2d..724720c 100644 --- a/entity/src/main/java/com/sv/dto/api/MemberLessonTicketDetailDTO.java +++ b/entity/src/main/java/com/sv/dto/api/MemberLessonTicketDetailDTO.java @@ -18,12 +18,23 @@ import java.util.Date; * @since 2018-08-06 */ public class MemberLessonTicketDetailDTO extends MemberLessonTicket { + private Integer id; private VenueLessonDTO venueLesson; private Order order; private Venue venue; private MemberCard memberCard = new MemberCard(); private Integer lessonCount; + @Override + public Integer getId() { + return id; + } + + @Override + public void setId(Integer id) { + this.id = id; + } + public VenueLessonDTO getVenueLesson() { return venueLesson; } @@ -63,4 +74,4 @@ public class MemberLessonTicketDetailDTO extends MemberLessonTicket { public void setLessonCount(Integer lessonCount) { this.lessonCount = lessonCount; } -} \ No newline at end of file +} diff --git a/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java b/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java index fbedd66..6545e79 100644 --- a/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java +++ b/entity/src/main/java/com/sv/dto/api/MemberTicketEnterDTO.java @@ -1,12 +1,39 @@ package com.sv.dto.api; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sv.entity.MemberLessonTicket; +import com.sv.json.LocalTimeSerializer; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalTime; +import java.util.Date; import java.util.List; public class MemberTicketEnterDTO extends MemberLessonTicket { private String venueName; - private String lessonName; + /** + * 上课日期 2018-03-30 + */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date date; + + /** + * 课程开始时间 8 + */ + @DateTimeFormat(iso = DateTimeFormat.ISO.TIME) + @JsonSerialize(using= LocalTimeSerializer.class) + private LocalTime startTime; + + /** + * 课程结束时间 12 + */ + @DateTimeFormat(iso = DateTimeFormat.ISO.TIME) + @JsonSerialize(using= LocalTimeSerializer.class) + private LocalTime endTime; + + // TODO 增加场馆位置信息 + private String mobile; private String errCode; private String msg; @@ -22,14 +49,6 @@ public class MemberTicketEnterDTO extends MemberLessonTicket { this.venueName = venueName; } - public String getLessonName() { - return lessonName; - } - - public void setLessonName(String lessonName) { - this.lessonName = lessonName; - } - public String getMobile() { return mobile; } @@ -38,6 +57,30 @@ public class MemberTicketEnterDTO extends MemberLessonTicket { this.mobile = mobile; } + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public LocalTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalTime startTime) { + this.startTime = startTime; + } + + public LocalTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalTime endTime) { + this.endTime = endTime; + } + public List getMemberTicketInviteList() { return memberTicketInviteList; } diff --git a/entity/src/main/java/com/sv/entity/MemberTicketInvite.java b/entity/src/main/java/com/sv/entity/MemberTicketInvite.java index 035cebf..09e5f54 100644 --- a/entity/src/main/java/com/sv/entity/MemberTicketInvite.java +++ b/entity/src/main/java/com/sv/entity/MemberTicketInvite.java @@ -5,6 +5,9 @@ import java.util.Date; public class MemberTicketInvite { private Integer id; + /** + * ticketId 客户预定的记录id + */ private Integer ownerId; private Integer memberId; @@ -135,4 +138,4 @@ public class MemberTicketInvite { public void setMobile(String mobile) { this.mobile = mobile; } -} \ No newline at end of file +} diff --git a/other/sql/202404.sql b/other/sql/202404.sql index 3a235db..325b51c 100644 --- a/other/sql/202404.sql +++ b/other/sql/202404.sql @@ -4,7 +4,7 @@ DROP TABLE IF EXISTS `sv_member_lesson_ticket_invite`; CREATE TABLE `sv_member_lesson_ticket_invite` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `owner_id` tinyint(4) NOT NULL DEFAULT '1' COMMENT '场馆类型', + `owner_id` int(11) NOT NULL DEFAULT '1' COMMENT '场馆类型', `member_id` int(11) NOT NULL, `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '状态：0-未选中 1-已选中', `platform_id` int(11) NOT NULL COMMENT '平台来源ID', diff --git a/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java b/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java index 95b20a6..bc61411 100644 --- a/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java +++ b/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java @@ -53,6 +53,7 @@ public interface MemberLessonTicketMapper { * @param id 编号 * @return 用户预约的场馆课程票号 */ + @NoPlatform MemberLessonTicket findById(Integer id); /** diff --git a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java index 37777b4..c53ea31 100644 --- a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java +++ b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java @@ -1,5 +1,6 @@ package com.sv.mapper; +import com.sv.annotation.NoPlatform; import com.sv.annotation.PlatformKey; import com.sv.dto.api.VenueLessonDTO; import com.sv.dto.app.VenueLessonStatus; diff --git a/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java b/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java index 4c1828f..12abd90 100644 --- a/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java +++ b/service/src/main/java/com/sv/service/api/MemberTicketEnterService.java @@ -1,45 +1,22 @@ package com.sv.service.api; -import com.enums.*; -import com.github.pagehelper.PageHelper; import com.sv.dto.api.*; -import com.sv.dto.api.wechat.OrderPaySignResponse; import com.sv.entity.*; -import com.sv.exception.api.ExceptionCodeTemplate; import com.sv.mapper.MemberLessonTicketMapper; import com.sv.mapper.MemberTicketInviteMapper; import com.sv.mapper.VenueLessonMapper; -import com.sv.service.api.util.DateUtilCard; -import com.sv.service.common.RedisLock; -import com.sv.service.message.AsyncTaskUtil; -import com.sv.service.message.NotifyAdminMsgThread; -import com.ydd.framework.core.common.Pagination; -import com.ydd.framework.core.common.utils.ValidationUtils; -import com.ydd.framework.core.entity.enums.DeletedEnum; -import com.ydd.framework.core.entity.enums.StatusEnum; -import com.ydd.framework.core.exception.ServiceException; import com.ydd.framework.core.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.text.DecimalFormat; import java.time.LocalTime; import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalUnit; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; - -import static com.sv.entity.Constants.LESSON_TICKET_LOCK_KEY; - /** * Service - 用户查询预订列表 * @@ -70,7 +47,7 @@ public class MemberTicketEnterService extends BaseServiceImpl { if (memberLessonTicket == null) { res.setErrCode("2"); res.setMsg("未找到对应的预订信息"); - } + }// TODO 查询场馆表 // 判断场馆是否已经超时 VenueLesson venueLesson = venueLessonMapper.findById(memberLessonTicket.getLessonId()); LocalTime endTime = venueLesson.getEndTime(); diff --git a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml index 425901b..68b0697 100644 --- a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml @@ -540,6 +540,7 @@ - select + select from sv_member_lesson_ticket_invite where id = #{id,jdbcType=INTEGER} @@ -31,13 +31,13 @@ where id = #{id,jdbcType=INTEGER} - insert into sv_member_lesson_ticket_invite (id, owner_id, member_id, - status, platform_id, created_id, - modified_id, created_time, modified_time, + insert into sv_member_lesson_ticket_invite (id, owner_id, member_id, + status, platform_id, created_id, + modified_id, created_time, modified_time, deleted) - values (#{id,jdbcType=INTEGER}, #{ownerId,jdbcType=INTEGER}, #{memberId,jdbcType=INTEGER}, - #{status,jdbcType=INTEGER}, #{platformId,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, - #{modifiedId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=INTEGER}, #{ownerId,jdbcType=INTEGER}, #{memberId,jdbcType=INTEGER}, + #{status,jdbcType=INTEGER}, #{platformId,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, + #{modifiedId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=INTEGER}) @@ -160,14 +160,14 @@ a.modified_time, a.deleted,b.mobile from sv_member_lesson_ticket_invite a,sv_member b where a.member_id = b.id - owner_id = #{ticketId,jdbcType=INTEGER} + and owner_id = #{ticketId,jdbcType=INTEGER} - select count(1) from sv_member_lesson_ticket_invite where member_id = #{memberId,jdbcType=INTEGER} - owner_id = #{ticketId,jdbcType=INTEGER} + and owner_id = #{ticketId,jdbcType=INTEGER} - \ No newline at end of file +