Merge pull request '修改预约提交接口' (#42) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #42
This commit is contained in:
root 2024-10-14 13:52:08 +08:00
commit 8fc219ad38
4 changed files with 41 additions and 5 deletions

View File

@ -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 = "预约时间段不能为空")

View File

@ -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<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) {
// return success(litemallReservationService.createLitemallReservation(createReqVO));
// }
// /**
// * 新增预约管理
// */
// @PostMapping("/add")
// public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO litemallReservationDO) {
// return success(litemallReservationService.createReservation(litemallReservationDO));
// }
/**
* 新增预约管理
*/
@PostMapping
public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) {
return success(litemallReservationService.createLitemallReservation(createReqVO));
@PostMapping("/add")
public CommonResult<Long> 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));
}
// /**
// * 修改预约管理
// */

View File

@ -33,6 +33,8 @@ public interface LitemallReservationService {
*/
Long createLitemallReservation(@Valid LitemallReservationSaveReqVO createReqVO);
Long createReservation(LitemallReservationSaveReqVO litemallReservationDO);
/**
* 更新预约订单
*

View File

@ -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());