From 9601e1572e21eaecb28d142399b0a53b6e512cae Mon Sep 17 00:00:00 2001 From: limqhz Date: Thu, 4 Mar 2021 15:22:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9C=BA=E9=A6=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sv/netty/controller/AppVenueLessonController.java | 8 ++------ .../src/main/java/com/sv/mapper/VenueLessonMapper.java | 5 ++--- .../main/java/com/sv/service/api/VenueLessonService.java | 5 ++--- .../resources/mybatis/mapper/sv/VenueLessonMapper.xml | 7 ++++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java index d0cd6d9..853fb57 100644 --- a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java +++ b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java @@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.time.LocalDate; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController public class AppVenueLessonController { @@ -31,7 +29,6 @@ public class AppVenueLessonController { */ @RequestMapping("/getLessonOrder/{id}") public String getLessonOrder(@PathVariable("id") Integer id,String date) { - System.out.println("测试一下 ====================== " + date); if (date == null && "".equals(date)){ LocalDate now = LocalDate.now(); date = now.toString(); @@ -44,20 +41,19 @@ public class AppVenueLessonController { LocalDate now = LocalDate.now(); date = now.toString(); } - List lessonOrder = venueLessonService.getLessonOrder(id, date); + List lessonOrder = venueLessonService.getLessonOrder(id); if (lessonOrder != null && lessonOrder.size() > 0){ String returnHtml = concatResult(lessonOrder); return returnHtml; }else { return "

~_~该场馆当天没有课程~_~

"; - } } private String concatResult(List lessonOrder) { StringBuffer sb = new StringBuffer(); sb.append(""); - sb.append(""); + sb.append(""); sb.append("

【" + lessonOrder.get(0).getVenueName() + "】(" + lessonOrder.get(0).getSearchDate() + ")预订信息一览表" + "

"); sb.append(""); sb.append("" + diff --git a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java index bfd42bb..a85cd19 100644 --- a/service/src/main/java/com/sv/mapper/VenueLessonMapper.java +++ b/service/src/main/java/com/sv/mapper/VenueLessonMapper.java @@ -136,9 +136,8 @@ public interface VenueLessonMapper { /** * APP获取当前预订情况 * @param venueId - * @param searchDate * and b.date = #{searchDate} and b.venue_id = #{venueId} * @return */ - List getLessonStatus(@Param("venueId") Integer venueId,@Param("searchDate") String searchDate); -} \ No newline at end of file + List getLessonStatus(@Param("venueId") Integer venueId); +} diff --git a/service/src/main/java/com/sv/service/api/VenueLessonService.java b/service/src/main/java/com/sv/service/api/VenueLessonService.java index 809e40c..fad13c9 100644 --- a/service/src/main/java/com/sv/service/api/VenueLessonService.java +++ b/service/src/main/java/com/sv/service/api/VenueLessonService.java @@ -325,9 +325,8 @@ public class VenueLessonService extends BaseServiceImpl { } @Transactional - public List getLessonOrder(Integer venueId,String searchDate){ - // 校验场馆是否存在 TODO - return venueLessonMapper.getLessonStatus(venueId,searchDate); + public List getLessonOrder(Integer venueId){ + return venueLessonMapper.getLessonStatus(venueId); } } diff --git a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml index b8778dc..3b6526d 100644 --- a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml @@ -612,13 +612,14 @@ a.sale_num as 'saleNum',(a.num-a.sale_num) as 'limitNum', IFNULL(t.orderUsers,'暂无预订') as 'orderUsers',a.note from sv_venue_lesson a LEFT JOIN - (select b.lesson_id,group_concat(d.nickname,'(',d.mobile,')') as 'orderUsers' + (select b.lesson_id,group_concat(d.nickname,'(',d.mobile,')',' ]]>') as 'orderUsers' from sv_member_lesson_ticket b , sv_member d where b.member_id = d.id and b.`status` != '2' GROUP BY b.lesson_id) t on a.id = t.lesson_id - where a.date = #{searchDate} + where a.date = ]]> NOW() + AND a.date DATE_ADD(NOW(),INTERVAL 2 DAY) and a.venue_id = #{venueId} - \ No newline at end of file +