yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java

@@ -130,19 +130,16 @@ 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) {
-            pageReqVO.setPageNo(1);
+            page = new Page<>(1, count);
-            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");
@@ -162,9 +159,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);
         }

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 String reAddTime;
+    private LocalDateTime reAddTime;
 
     @Schema(description = "预约时间段", requiredMode = Schema.RequiredMode.REQUIRED)
 //    @NotNull(message = "预约时间段不能为空")

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java

@@ -7,7 +7,6 @@ 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;
@@ -79,40 +78,14 @@ 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("/add")
+    @PostMapping
-    public CommonResult<Long> createLitemallReservation(Integer type,String brandId,String technicianId,String reAddTime,String hsstr,Long userId) {
+    public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) {
-
+        return success(litemallReservationService.createLitemallReservation(createReqVO));
-        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));
     }
 
-
 //    /**
 //     * 修改预约管理
 //     */

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java

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

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java

@@ -68,13 +68,6 @@ 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) {
         // 校验存在
@@ -112,7 +105,7 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic
             LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId());
             litemallReservationDO.setBrandName(litemallBrandDO.getName());
 
-            LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId());
+            LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getId());
             litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName());
 
             MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId());