BJ_ZTEITS-Developers / parking-cloud-yudao

Commit fc3245a06b618640d28f9bffa603a205113d58e2

Authored by halfninety
1 parent 54baad16

修改秒杀相关文件地址

Inline Side-by-side
Showing 31 changed files with 89 additions and 96 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/SeckillActivityController.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/SeckillActivityController.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.*;  
6 -import cn.iocoder.yudao.module.promotion.convert.seckillactivity.SeckillActivityConvert;  
7 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO;  
8 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillProductDO;  
9 -import cn.iocoder.yudao.module.promotion.service.seckillactivity.SeckillActivityService; 5 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.*;
  6 +import cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity.SeckillActivityConvert;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
  8 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillProductDO;
  9 +import cn.iocoder.yudao.module.promotion.service.seckill.seckillactivity.SeckillActivityService;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiImplicitParam; 11 import io.swagger.annotations.ApiImplicitParam;
12 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityBaseVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityBaseVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import com.fasterxml.jackson.annotation.JsonFormat; 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityCreateReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityCreateReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityDetailRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityDetailRespVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityPageReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityPageReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import com.fasterxml.jackson.annotation.JsonFormat; 4 import com.fasterxml.jackson.annotation.JsonFormat;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityRespVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckillactivity/vo/SeckillActivityUpdateReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckillactivity/vo/SeckillActivityUpdateReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/SeckillTimeController.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/SeckillTimeController.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.SeckillTimeCreateReqVO;  
5 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.SeckillTimeRespVO;  
6 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.SeckillTimeUpdateReqVO;  
7 -import cn.iocoder.yudao.module.promotion.convert.seckilltime.SeckillTimeConvert;  
8 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO;  
9 -import cn.iocoder.yudao.module.promotion.service.seckilltime.SeckillTimeService; 4 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeCreateReqVO;
  5 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeRespVO;
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeUpdateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.convert.seckill.seckilltime.SeckillTimeConvert;
  8 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
  9 +import cn.iocoder.yudao.module.promotion.service.seckill.seckilltime.SeckillTimeService;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiImplicitParam; 11 import io.swagger.annotations.ApiImplicitParam;
12 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimeBaseVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimeBaseVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
2 2
3 import lombok.*; 3 import lombok.*;
4 4
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimeCreateReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimeCreateReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
2 2
3 import lombok.*; 3 import lombok.*;
4 -import java.util.*;  
5 import io.swagger.annotations.*; 4 import io.swagger.annotations.*;
6 -import javax.validation.constraints.*;  
7 5
8 @ApiModel("管理后台 - 秒杀时段创建 Request VO") 6 @ApiModel("管理后台 - 秒杀时段创建 Request VO")
9 @Data 7 @Data
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimePageReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimePageReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimeRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimeRespVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
2 2
3 import lombok.*; 3 import lombok.*;
4 import java.util.*; 4 import java.util.*;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimeSimpleRespVO.java 0 → 100644
  View file @fc3245a
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
  2 +
  3 +public class SeckillTimeSimpleRespVO {
  4 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimeUpdateReqVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/seckilltime/vo/SeckillTimeUpdateReqVO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckilltime/vo/SeckillTimeSimpleRespVO.java deleted
View file @54baad1
1 -package cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo;  
2 -  
3 -public class SeckillTimeSimpleRespVO {  
4 -}  
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckillactivity/SeckillActivityConvert.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.convert.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity;
2 2
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.*;  
6 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO;  
7 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillProductDO; 5 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.*;
  6 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillProductDO;
8 import org.mapstruct.Mapper; 8 import org.mapstruct.Mapper;
9 import org.mapstruct.Mapping; 9 import org.mapstruct.Mapping;
10 import org.mapstruct.Mappings; 10 import org.mapstruct.Mappings;
@@ -40,7 +40,7 @@ public interface SeckillActivityConvert { @@ -40,7 +40,7 @@ public interface SeckillActivityConvert {
40 PageResult<SeckillActivityRespVO> convertPage(PageResult<SeckillActivityDO> page); 40 PageResult<SeckillActivityRespVO> convertPage(PageResult<SeckillActivityDO> page);
41 41
42 @Mappings({@Mapping(target = "products",source = "seckillProducts")}) 42 @Mappings({@Mapping(target = "products",source = "seckillProducts")})
43 - SeckillActivityDetailRespVO convert(SeckillActivityDO seckillActivity,List<SeckillProductDO> seckillProducts); 43 + SeckillActivityDetailRespVO convert(SeckillActivityDO seckillActivity, List<SeckillProductDO> seckillProducts);
44 44
45 45
46 /** 46 /**
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckilltime/SeckillTimeConvert.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckilltime/SeckillTimeConvert.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.convert.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.convert.seckill.seckilltime;
2 2
3 import java.util.*; 3 import java.util.*;
4 4
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6
  7 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeCreateReqVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeRespVO;
  9 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeUpdateReqVO;
7 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 11 import org.mapstruct.factory.Mappers;
9 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.*;  
10 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO; 12 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
11 13
12 /** 14 /**
13 * 秒杀时段 Convert 15 * 秒杀时段 Convert
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckillactivity/SeckillActivityDO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckill/seckillactivity/SeckillActivityDO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.KeySequence; 4 import com.baomidou.mybatisplus.annotation.KeySequence;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckillactivity/SeckillProductDO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckill/seckillactivity/SeckillProductDO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.IdType; 4 import com.baomidou.mybatisplus.annotation.IdType;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckilltime/SeckillTimeDO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/seckill/seckilltime/SeckillTimeDO.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.KeySequence; 4 import com.baomidou.mybatisplus.annotation.KeySequence;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckillactivity/SeckillActivityMapper.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityPageReqVO;  
7 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO; 6 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityPageReqVO;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
8 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
9 9
10 /** 10 /**
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckillactivity/SeckillProductMapper.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillProductMapper.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillProductDO; 4 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillProductDO;
5 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
6 6
7 import java.util.Collection; 7 import java.util.Collection;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckilltime/SeckillTimeMapper.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckilltime/SeckillTimeMapper.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.dal.mysql.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckilltime;
2 2
3 import java.time.LocalTime; 3 import java.time.LocalTime;
4 import java.util.*; 4 import java.util.*;
5 5
6 import cn.hutool.core.collection.CollUtil; 6 import cn.hutool.core.collection.CollUtil;
7 -import cn.hutool.core.util.ObjectUtil;  
8 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
9 -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;  
10 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
11 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO; 8 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
12 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 9 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
13 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; 10 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
14 -import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;  
15 import org.apache.ibatis.annotations.Mapper; 11 import org.apache.ibatis.annotations.Mapper;
16 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.*;  
17 12
18 /** 13 /**
19 * 秒杀时段 Mapper 14 * 秒杀时段 Mapper
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityService.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckillactivity/SeckillActivityService.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.service.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.service.seckill.seckillactivity;
2 2
3 import java.util.*; 3 import java.util.*;
4 import javax.validation.*; 4 import javax.validation.*;
5 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.*;  
6 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO; 5 +
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityCreateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityPageReqVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityUpdateReqVO;
  9 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillProductDO; 11 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillProductDO;
9 12
10 /** 13 /**
11 * 秒杀活动 Service 接口 14 * 秒杀活动 Service 接口
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImpl.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckillactivity/SeckillActivityServiceImpl.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.service.seckillactivity; 1 +package cn.iocoder.yudao.module.promotion.service.seckill.seckillactivity;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 import cn.iocoder.yudao.framework.common.util.string.StrUtils; 6 import cn.iocoder.yudao.framework.common.util.string.StrUtils;
7 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityBaseVO;  
8 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityCreateReqVO;  
9 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityPageReqVO;  
10 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityUpdateReqVO;  
11 -import cn.iocoder.yudao.module.promotion.convert.seckillactivity.SeckillActivityConvert;  
12 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO;  
13 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillProductDO;  
14 -import cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity.SeckillActivityMapper;  
15 -import cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity.SeckillProductMapper; 7 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityBaseVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityCreateReqVO;
  9 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityPageReqVO;
  10 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityUpdateReqVO;
  11 +import cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity.SeckillActivityConvert;
  12 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
  13 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillProductDO;
  14 +import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillActivityMapper;
  15 +import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillProductMapper;
16 import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum; 16 import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum;
17 -import cn.iocoder.yudao.module.promotion.service.seckilltime.SeckillTimeService; 17 +import cn.iocoder.yudao.module.promotion.service.seckill.seckilltime.SeckillTimeService;
18 import cn.iocoder.yudao.module.promotion.util.PromotionUtils; 18 import cn.iocoder.yudao.module.promotion.util.PromotionUtils;
19 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
20 import org.springframework.validation.annotation.Validated; 20 import org.springframework.validation.annotation.Validated;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckilltime/SeckillTimeService.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckilltime/SeckillTimeService.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.service.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.service.seckill.seckilltime;
2 2
3 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.SeckillTimeCreateReqVO;  
4 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.SeckillTimeUpdateReqVO;  
5 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO; 3 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeCreateReqVO;
  4 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeUpdateReqVO;
  5 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
6 6
7 import javax.validation.Valid; 7 import javax.validation.Valid;
8 import java.util.List; 8 import java.util.List;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckilltime/SeckillTimeServiceImpl.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckilltime/SeckillTimeServiceImpl.java
  View file @fc3245a
1 -package cn.iocoder.yudao.module.promotion.service.seckilltime; 1 +package cn.iocoder.yudao.module.promotion.service.seckill.seckilltime;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeCreateReqVO;
  5 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeUpdateReqVO;
4 import org.springframework.stereotype.Service; 6 import org.springframework.stereotype.Service;
5 7
6 import javax.annotation.Resource; 8 import javax.annotation.Resource;
@@ -10,11 +12,10 @@ import org.springframework.validation.annotation.Validated; @@ -10,11 +12,10 @@ import org.springframework.validation.annotation.Validated;
10 import java.time.LocalTime; 12 import java.time.LocalTime;
11 import java.util.*; 13 import java.util.*;
12 14
13 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.*;  
14 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO; 15 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
15 16
16 -import cn.iocoder.yudao.module.promotion.convert.seckilltime.SeckillTimeConvert;  
17 -import cn.iocoder.yudao.module.promotion.dal.mysql.seckilltime.SeckillTimeMapper; 17 +import cn.iocoder.yudao.module.promotion.convert.seckill.seckilltime.SeckillTimeConvert;
  18 +import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckilltime.SeckillTimeMapper;
18 19
19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 20 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*; 21 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
yudao-module-mall/yudao-module-promotion-biz/src/main/resources/mapper/seckillactivity/SeckillActivityMapper.xml
  View file @fc3245a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity.SeckillActivityMapper"> 3 +<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillActivityMapper">
4 4
5 <!-- 5 <!--
6 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 6 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
yudao-module-mall/yudao-module-promotion-biz/src/main/resources/mapper/seckilltime/SeckillTimeMapper.xml
  View file @fc3245a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.seckilltime.SeckillTimeMapper"> 3 +<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckilltime.SeckillTimeMapper">
4 4
5 <!-- 5 <!--
6 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 6 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java
  View file @fc3245a
@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.promotion.service.seckillactivity; @@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.promotion.service.seckillactivity;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; 4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
5 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityCreateReqVO;  
6 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityPageReqVO;  
7 -import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.SeckillActivityUpdateReqVO;  
8 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckillactivity.SeckillActivityDO;  
9 -import cn.iocoder.yudao.module.promotion.dal.mysql.seckillactivity.SeckillActivityMapper; 5 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityCreateReqVO;
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityPageReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckillactivity.vo.SeckillActivityUpdateReqVO;
  8 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillactivity.SeckillActivityDO;
  9 +import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillActivityMapper;
  10 +import cn.iocoder.yudao.module.promotion.service.seckill.seckillactivity.SeckillActivityServiceImpl;
10 import org.junit.jupiter.api.Disabled; 11 import org.junit.jupiter.api.Disabled;
11 import org.junit.jupiter.api.Test; 12 import org.junit.jupiter.api.Test;
12 import org.springframework.context.annotation.Import; 13 import org.springframework.context.annotation.Import;
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/seckilltime/SeckillTimeServiceImplTest.java
  View file @fc3245a
1 package cn.iocoder.yudao.module.promotion.service.seckilltime; 1 package cn.iocoder.yudao.module.promotion.service.seckilltime;
2 2
  3 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeCreateReqVO;
  4 +import cn.iocoder.yudao.module.promotion.controller.admin.seckill.seckilltime.vo.SeckillTimeUpdateReqVO;
  5 +import cn.iocoder.yudao.module.promotion.service.seckill.seckilltime.SeckillTimeServiceImpl;
3 import com.fasterxml.jackson.core.JsonProcessingException; 6 import com.fasterxml.jackson.core.JsonProcessingException;
4 import com.fasterxml.jackson.databind.ObjectMapper; 7 import com.fasterxml.jackson.databind.ObjectMapper;
5 import org.junit.jupiter.api.Disabled; 8 import org.junit.jupiter.api.Disabled;
6 import org.junit.jupiter.api.Test; 9 import org.junit.jupiter.api.Test;
7 -import org.springframework.boot.test.mock.mockito.MockBean;  
8 10
9 import javax.annotation.Resource; 11 import javax.annotation.Resource;
10 12
11 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; 13 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
12 14
13 -import cn.iocoder.yudao.module.promotion.controller.admin.seckilltime.vo.*;  
14 -import cn.iocoder.yudao.module.promotion.dal.dataobject.seckilltime.SeckillTimeDO;  
15 -import cn.iocoder.yudao.module.promotion.dal.mysql.seckilltime.SeckillTimeMapper;  
16 -import cn.iocoder.yudao.framework.common.pojo.PageResult; 15 +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckilltime.SeckillTimeDO;
  16 +import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckilltime.SeckillTimeMapper;
17 17
18 -import javax.annotation.Resource;  
19 import org.springframework.context.annotation.Import; 18 import org.springframework.context.annotation.Import;
20 19
21 -import java.time.LocalTime;  
22 -import java.util.*;  
23 -  
24 -import static cn.hutool.core.util.RandomUtil.*;  
25 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*; 20 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; 21 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
27 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; 22 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
28 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; 23 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
29 -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;  
30 import static org.junit.jupiter.api.Assertions.*; 24 import static org.junit.jupiter.api.Assertions.*;
31 -import static org.mockito.Mockito.*;  
32 25
33 /** 26 /**
34 * {@link SeckillTimeServiceImpl} 的单元测试类 27 * {@link SeckillTimeServiceImpl} 的单元测试类