From 52d615d5a9ab94d2b038e2b166f99c4f7ccd4f3d Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Fri, 15 Mar 2024 08:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=B9=B3=E6=9D=BF?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E5=BA=94=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86PC=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=8D=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/ReservationController.java | 8 +- .../controller/meeting/TicketController.java | 79 ++++++++++++- .../java/com/ics/admin/domain/Repair.java | 2 + .../com/ics/admin/domain/meeting/Ticket.java | 6 + .../mapper/meeting/ReservationMapper.java | 2 + .../mapper/meeting/RoomContentMapper.java | 2 + .../meeting/CustomerTicketServiceImpl.java | 8 ++ .../impl/meeting/ReservationServiceImpl.java | 13 +++ .../impl/meeting/RoomContentServiceImpl.java | 19 ++++ .../meeting/ICustomerTicketService.java | 1 + .../service/meeting/IRoomContentService.java | 2 + .../admin/meeting/ReservationMapper.xml | 23 +++- .../admin/meeting/RoomContentMapper.xml | 22 +++- .../mapper/admin/meeting/TicketMapper.xml | 6 +- .../mobile/ActivityAPIController.java | 1 + .../meeting/ApiEquipmentController.java | 26 +++++ .../meeting/ApiRoomContentController.java | 4 + .../mobile/meeting/ApiRoomController.java | 104 ++++++++++++++++++ .../mobile/meeting/ApiVisitorController.java | 29 +++-- .../mobile/member/RepairAPIController.java | 40 ++++--- 20 files changed, 362 insertions(+), 35 deletions(-) create mode 100644 ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java index dc8dbf8..2160ecc 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java @@ -14,6 +14,8 @@ import com.ics.admin.domain.meeting.Reservation; import com.ics.admin.service.meeting.IReservationService; import org.wf.jwtp.annotation.RequiresPermissions; +import java.util.List; + /** * 预约记录 提供者 * @@ -42,7 +44,11 @@ public class ReservationController extends BaseController { @GetMapping("list") public R list(Reservation reservation) { startPage(); - return result(reservationService.selectReservationList(reservation)); + List reservations = reservationService.selectReservationList(reservation); + for (Reservation reservation1 : reservations) { + //会议室名称 + } + return result(reservations); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java index a479dc1..bf9074f 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java @@ -1,7 +1,12 @@ package com.ics.admin.controller.meeting; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ArrayUtil; import com.ics.admin.domain.Customer; +import com.ics.admin.domain.meeting.CustomerTicket; import com.ics.admin.service.ICustomerService; +import com.ics.admin.service.meeting.ICustomerTicketService; import com.ics.system.domain.User; import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +25,9 @@ import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 优惠卷 提供者 @@ -41,12 +48,24 @@ public class TicketController extends BaseController { @Autowired private IUserService userService; + @Autowired + private ICustomerTicketService customerTicketService; + /** * 查询优惠卷 */ + @Ignore @GetMapping("get/{id}") public Ticket get(@PathVariable("id") Long id) { - return ticketService.selectTicketById(id); + Ticket ticket = ticketService.selectTicketById(id); + List customerTickets = customerTicketService.selectCustomerTicketByTicketId(id); + + List collect = customerTickets.stream().map(item -> { + return item.getCustomerId(); + }).collect(Collectors.toList()); + Long[] array = collect.toArray(new Long[collect.size()]); + ticket.setEnterpriseIds(array); + return ticket; } /** @@ -66,6 +85,32 @@ public class TicketController extends BaseController { @RequiresPermissions("meeting:ticket:add") @PostMapping("save") public R addSave(@RequestBody Ticket ticket) { + System.out.println(ticket); + CustomerTicket customerTicket = customerTicketService.selectCustomerTicketById(ticket.getId()); +// if (ticket.getType() == 1){ +// for (int j = 0; j < ticket.get; j++) { +// +// } + if (customerTicket ==null){ + if (ticket.getType() == 1) { + for (Long enterpriseId : ticket.getEnterpriseIds()) { + + CustomerTicket customerTicket1 = new CustomerTicket(); + customerTicket1.setTicketId(ticket.getId()); + customerTicket1.setCustomerId(enterpriseId); + customerTicket1.setIsVerification(0); + customerTicketService.insertCustomerTicket(customerTicket1); + } + }else { + for (Long enterpriseId : ticket.getEnterpriseIds()) { + CustomerTicket customerTicket1 = new CustomerTicket(); + customerTicket1.setTicketId(ticket.getId()); + customerTicket1.setCustomerId(enterpriseId); + customerTicket1.setIsVerification(0); + customerTicketService.insertCustomerTicket(customerTicket1); + } + } + } return toAjax(ticketService.insertTicket(ticket)); } @@ -75,7 +120,37 @@ public class TicketController extends BaseController { @RequiresPermissions("meeting:ticket:edit") @PostMapping("update") public R editSave(@RequestBody Ticket ticket) { - return toAjax(ticketService.updateTicket(ticket)); + int i = ticketService.updateTicket(ticket); + Assert.isTrue(i == 1, "修改失败"); + //修改企业和优惠卷数据 如果类型是 抵用卷，循环添加，如果是优惠卷，添加一条 + + CustomerTicket customerTicket = customerTicketService.selectCustomerTicketById(ticket.getId()); +// if (ticket.getType() == 1){ +// for (int j = 0; j < ticket.get; j++) { +// +// } + if (customerTicket ==null){ + if (ticket.getType() == 1) { + for (Long enterpriseId : ticket.getEnterpriseIds()) { + // 循环数量 + CustomerTicket customerTicket1 = new CustomerTicket(); + customerTicket1.setTicketId(ticket.getId()); + customerTicket1.setCustomerId(enterpriseId); + customerTicket1.setIsVerification(0); + customerTicketService.insertCustomerTicket(customerTicket1); + } + }else { + for (Long enterpriseId : ticket.getEnterpriseIds()) { + CustomerTicket customerTicket1 = new CustomerTicket(); + customerTicket1.setTicketId(ticket.getId()); + customerTicket1.setCustomerId(enterpriseId); + customerTicket1.setIsVerification(0); + customerTicketService.insertCustomerTicket(customerTicket1); + } + } + + } + return toAjax(i); } /** diff --git a/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/ics-admin/src/main/java/com/ics/admin/domain/Repair.java index 9d6cdc4..4dd0881 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/Repair.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/Repair.java @@ -186,5 +186,7 @@ public class Repair extends BaseEntity { @TableField(exist = false) private User user; + private Long parkId; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java index 05f7724..f8aa202 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java @@ -1,5 +1,6 @@ package com.ics.admin.domain.meeting; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ics.common.core.domain.BaseEntity; @@ -29,6 +30,8 @@ public class Ticket extends BaseEntity { /** 金额 */ private Integer duration; + private String discount; + /** 地址 */ private String address; @@ -52,4 +55,7 @@ public class Ticket extends BaseEntity { /** 是否默认 */ private String isDefault; + @TableField(exist = false) + private Long[] enterpriseIds; + } diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/ReservationMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/ReservationMapper.java index f528f86..2cad685 100644 --- a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/ReservationMapper.java +++ b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/ReservationMapper.java @@ -2,6 +2,7 @@ package com.ics.admin.mapper.meeting; import com.ics.admin.domain.meeting.Reservation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ics.admin.domain.meeting.RoomContent; import org.apache.ibatis.annotations.Mapper; import java.util.Date; @@ -65,4 +66,5 @@ public interface ReservationMapper extends BaseMapper { List selectListByDate(Long meetingRoomId); + List todayMeeting(Long id); } diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/RoomContentMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/RoomContentMapper.java index 51527e7..09ba7a5 100644 --- a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/RoomContentMapper.java +++ b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/RoomContentMapper.java @@ -61,4 +61,6 @@ public interface RoomContentMapper extends BaseMapper { * @return 结果 */ int deleteRoomContentByIds(String[] ids); + + List todayMeeting(Long id); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java index 14f790c..c559ab9 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java @@ -134,4 +134,12 @@ public class CustomerTicketServiceImpl extends ServiceImpl selectCustomerTicketByTicketId(Long id) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ticket_id", id); + wrapper.groupBy("customer_id"); + return customerTicketMapper.selectList(wrapper); + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java index 05f4b41..d71b92b 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java @@ -161,6 +161,12 @@ public class ReservationServiceImpl extends ServiceImplduration){ @@ -186,6 +192,13 @@ public class ReservationServiceImpl extends ServiceImpl hour) { diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java index e61a4dc..c6344e5 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java @@ -19,8 +19,11 @@ import com.ics.admin.mapper.meeting.ReservationMapper; import com.ics.admin.mapper.meeting.RoomItemByRoomMapper; import com.ics.admin.mapper.meeting.RoomServeByRoomMapper; import com.ics.admin.service.IBuildingDetailService; +import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.IRoomService; import com.ics.admin.service.meeting.*; +import com.ics.common.core.domain.IcsCustomerStaff; +import com.ics.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ics.admin.mapper.meeting.RoomContentMapper; @@ -64,6 +67,9 @@ public class RoomContentServiceImpl extends ServiceImpl todayMeeting(RoomContent roomContent) { + + //查询当前之前以后，当前时间是否包含在会议室 + List reservations = reservationMapper.todayMeeting(roomContent.getId()); + for (Reservation reservation : reservations) { + Long userId = reservation.getUserId(); + IcsCustomerStaff customerStaff = staffService.selectIcsCustomerStaffById(userId); + reservation.setUserName(customerStaff.getUsername()); + } + return reservations; + } + } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java index d714830..37e7112 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java @@ -65,4 +65,5 @@ public interface ICustomerTicketService extends IService { void updateCustomerTicketBYUserId(CustomerTicket customerTicket); + List selectCustomerTicketByTicketId(Long id); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java index 050dcf6..eeb0e17 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java @@ -75,4 +75,6 @@ public interface IRoomContentService extends IService { int roomServeByRoom(RoomServeByRoom roomServeByRoom); int addItemServe(RoomItemByRoom roomItemByRoom); + + List todayMeeting(RoomContent roomContent); } diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml index c29feb9..2d0124f 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml @@ -37,7 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT id, room_content_id, user_id, ticket_id, customer_id, title, stauts,serve_id,end_date, is_after_sale, - oder_number,reservation_number, order_money, cancel_time, cancel_resaon, visit_type, explain_need_type, meeting_need_type, photograph_type, start_time, end_time, delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_reservation + oder_number,reservation_number, order_money, cancel_time, + cancel_resaon, visit_type, explain_need_type, meeting_need_type, photograph_type, start_time, + delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_reservation + INSERT INTO tb_reservation diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml index bd0094b..c6cfeb2 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml @@ -52,7 +52,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - + + INSERT INTO tb_room_content diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/TicketMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/TicketMapper.xml index ae6b67c..9f51992 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/TicketMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/TicketMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id, title, content, type, duration, address, is_verification, is_show, start_time, end_date, remark, is_default, version, delete_flag, create_by, create_time, update_by, update_time FROM tb_ticket + SELECT id, title, content, type, duration, address, is_verification,discount, is_show, start_time, end_date, remark, is_default, version, delete_flag, create_by, create_time, update_by, update_time FROM tb_ticket