Compare commits

...

5 Commits

Author SHA1 Message Date
0da862a180 秒杀列表改回获取全部商品 2024-10-14 18:20:13 +08:00
8fc219ad38 Merge pull request '修改预约提交接口' (#42) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #42
2024-10-14 13:52:08 +08:00
6f2f58fbe9 修改预约提交接口 2024-10-14 13:19:30 +08:00
ad20ae2c4b Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #41
2024-10-12 14:50:00 +08:00
9ecb0ff24a Merge pull request '秒杀活动和拼团活动接口调整' (#40) from cxw into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
Reviewed-on: #40
2024-10-12 09:38:26 +08:00
5 changed files with 51 additions and 12 deletions

View File

@ -130,16 +130,19 @@ public class AppSeckillActivityController {
@GetMapping("/spuList")
@Parameter(name = "count", description = "需要展示的数量", example = "6")
@Operation(summary = "获得现在进行的秒杀活动分页")
@Operation(summary = "获得秒杀活动分页")
public CommonResult<List<ProductSpuRespDTO>> getSeckillActivitySupList(@RequestParam(name = "count", defaultValue = "3") Integer count) {
AppSeckillActivityPageReqVO pageReqVO = new AppSeckillActivityPageReqVO();
Page<SeckillActivityDO> page = new Page<>(1, 3);
;
if (count != null && count != 0) {
page = new Page<>(1, count);
pageReqVO.setPageNo(1);
pageReqVO.setPageSize(count);
}
// Page<SeckillActivityDO> page = new Page<>(1, 3);
// if (count != null && count != 0) {
// page = new Page<>(1, count);
// }
// 先找出当前时间对应的配置时间段id
List<Long> configIdList = new ArrayList<>();
/* List<Long> configIdList = new ArrayList<>();
try {
List<SeckillConfigDO> timeList = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
SimpleDateFormat format = new SimpleDateFormat("HH:mm");
@ -159,9 +162,9 @@ public class AppSeckillActivityController {
return success(null);
}
// 获取满足当前正在进行的活动
PageResult<SeckillActivityDO> pageResult = activityService.getRunningActivityByConfigIdsCount(configIdList, page);
PageResult<SeckillActivityDO> pageResult = activityService.getRunningActivityByConfigIdsCount(configIdList, page);*/
// 1. 查询满足当前阶段的活动
// PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
if (CollUtil.isEmpty(pageResult.getList())) {
return success(null);
}

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