From 6f2f58fbe92897294cd768b3b06626ee8c50ae49 Mon Sep 17 00:00:00 2001 From: sonjinyon <2476687577@qq.com> Date: Mon, 14 Oct 2024 13:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/LitemallReservationSaveReqVO.java | 2 +- .../reservation/AppReservationController.java | 33 +++++++++++++++++-- .../LitemallReservationService.java | 2 ++ .../LitemallReservationServiceImpl.java | 9 ++++- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java index 934496f..a7b491e 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java @@ -31,7 +31,7 @@ public class LitemallReservationSaveReqVO { @Schema(description = "预约时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "预约时间不能为空") - private LocalDateTime reAddTime; + private String reAddTime; @Schema(description = "预约时间段", requiredMode = Schema.RequiredMode.REQUIRED) // @NotNull(message = "预约时间段不能为空") diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java index ccb3305..0e6e82f 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.Litemal import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.LitemallReservationRespVO; import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.LitemallReservationSaveReqVO; import cn.iocoder.yudao.module.srbscribe.dal.dataobject.reservation.LitemallReservationDO; +import cn.iocoder.yudao.module.srbscribe.dal.dataobject.technician.LitemallTechnicianDO; import cn.iocoder.yudao.module.srbscribe.service.reservation.LitemallReservationService; import cn.iocoder.yudao.module.srbscribe.util.AjaxResult; import cn.iocoder.yudao.module.srbscribe.util.StringUtils; @@ -78,14 +79,40 @@ public class AppReservationController { // } // +// /** +// * 新增预约管理 +// */ +// @PostMapping +// public CommonResult createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) { +// return success(litemallReservationService.createLitemallReservation(createReqVO)); +// } + +// /** +// * 新增预约管理 +// */ +// @PostMapping("/add") +// public CommonResult createLitemallReservation(@RequestBody LitemallReservationSaveReqVO litemallReservationDO) { +// return success(litemallReservationService.createReservation(litemallReservationDO)); +// } + /** * 新增预约管理 */ - @PostMapping - public CommonResult createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) { - return success(litemallReservationService.createLitemallReservation(createReqVO)); + @PostMapping("/add") + public CommonResult createLitemallReservation(Integer type,String brandId,String technicianId,String reAddTime,String hsstr,Long userId) { + + LitemallReservationSaveReqVO litemallReservationSaveReqVO = new LitemallReservationSaveReqVO(); + litemallReservationSaveReqVO.setType(type); + litemallReservationSaveReqVO.setBrandId(brandId); + litemallReservationSaveReqVO.setTechnicianId(technicianId); + litemallReservationSaveReqVO.setReAddTime(reAddTime); + litemallReservationSaveReqVO.setHsstr(hsstr); + litemallReservationSaveReqVO.setUserId(userId); + + return success(litemallReservationService.createReservation(litemallReservationSaveReqVO)); } + // /** // * 修改预约管理 // */ diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java index e695284..6fb0d58 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java @@ -33,6 +33,8 @@ public interface LitemallReservationService { */ Long createLitemallReservation(@Valid LitemallReservationSaveReqVO createReqVO); + Long createReservation(LitemallReservationSaveReqVO litemallReservationDO); + /** * 更新预约订单 * diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java index 0e7e09d..6c13674 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java @@ -68,6 +68,13 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic return litemallReservation.getId(); } + @Override + public Long createReservation(LitemallReservationSaveReqVO litemallReservationDO) { + LitemallReservationDO litemallReservation = BeanUtils.toBean(litemallReservationDO, LitemallReservationDO.class); + litemallReservationMapper.insert(litemallReservation); + return litemallReservation.getId(); + } + @Override public void updateLitemallReservation(LitemallReservationSaveReqVO updateReqVO) { // 校验存在 @@ -105,7 +112,7 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId()); litemallReservationDO.setBrandName(litemallBrandDO.getName()); - LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getId()); + LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId()); litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName()); MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId());