Commit 07493bc7e5552896c11cd7bff03d0d81c2a648d4
1 parent
3f6f7f40
营销活动:实现 list-by-spu-id 接口
Showing
10 changed files
with
103 additions
and
13 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
| @@ -2,6 +2,13 @@ package cn.iocoder.yudao.module.promotion.controller.app.activity; | @@ -2,6 +2,13 @@ package cn.iocoder.yudao.module.promotion.controller.app.activity; | ||
| 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.app.activity.vo.AppActivityRespVO; | 4 | import cn.iocoder.yudao.module.promotion.controller.app.activity.vo.AppActivityRespVO; |
| 5 | +import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO; | ||
| 6 | +import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO; | ||
| 7 | +import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO; | ||
| 8 | +import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum; | ||
| 9 | +import cn.iocoder.yudao.module.promotion.service.bargain.BargainActivityService; | ||
| 10 | +import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService; | ||
| 11 | +import cn.iocoder.yudao.module.promotion.service.seckill.SeckillActivityService; | ||
| 5 | import io.swagger.v3.oas.annotations.Operation; | 12 | import io.swagger.v3.oas.annotations.Operation; |
| 6 | import io.swagger.v3.oas.annotations.Parameter; | 13 | import io.swagger.v3.oas.annotations.Parameter; |
| 7 | import io.swagger.v3.oas.annotations.tags.Tag; | 14 | import io.swagger.v3.oas.annotations.tags.Tag; |
| @@ -11,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; | @@ -11,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; | ||
| 11 | import org.springframework.web.bind.annotation.RequestParam; | 18 | import org.springframework.web.bind.annotation.RequestParam; |
| 12 | import org.springframework.web.bind.annotation.RestController; | 19 | import org.springframework.web.bind.annotation.RestController; |
| 13 | 20 | ||
| 21 | +import javax.annotation.Resource; | ||
| 14 | import java.time.LocalDateTime; | 22 | import java.time.LocalDateTime; |
| 15 | import java.util.*; | 23 | import java.util.*; |
| 16 | 24 | ||
| @@ -22,24 +30,46 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | @@ -22,24 +30,46 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | ||
| 22 | @Validated | 30 | @Validated |
| 23 | public class AppActivityController { | 31 | public class AppActivityController { |
| 24 | 32 | ||
| 25 | - // TODO @puhui999:可以实现下 | 33 | + @Resource |
| 34 | + private CombinationActivityService combinationActivityService; | ||
| 35 | + @Resource | ||
| 36 | + private SeckillActivityService seckillActivityService; | ||
| 37 | + @Resource | ||
| 38 | + private BargainActivityService bargainActivityService; | ||
| 39 | + | ||
| 26 | @GetMapping("/list-by-spu-id") | 40 | @GetMapping("/list-by-spu-id") |
| 27 | @Operation(summary = "获得单个商品,近期参与的每个活动") // 每种活动,只返回一个 | 41 | @Operation(summary = "获得单个商品,近期参与的每个活动") // 每种活动,只返回一个 |
| 28 | @Parameter(name = "spuId", description = "商品编号", required = true) | 42 | @Parameter(name = "spuId", description = "商品编号", required = true) |
| 29 | public CommonResult<List<AppActivityRespVO>> getActivityListBySpuId(@RequestParam("spuId") Long spuId) { | 43 | public CommonResult<List<AppActivityRespVO>> getActivityListBySpuId(@RequestParam("spuId") Long spuId) { |
| 30 | - // TODO 芋艿,实现 | ||
| 31 | - List<AppActivityRespVO> randomList = new ArrayList<>(); | ||
| 32 | - Random random = new Random(); | ||
| 33 | - for (int i = 0; i < 3; i++) { // 生成5个随机对象 | ||
| 34 | - AppActivityRespVO vo = new AppActivityRespVO(); | ||
| 35 | - vo.setId(random.nextLong()); // 随机生成一个长整型 ID | ||
| 36 | - vo.setType(i + 1); // 随机生成一个介于0到2之间的整数,对应枚举类型的三种类型之一 | ||
| 37 | - vo.setName(String.format("活动%d", random.nextInt(100))); // 随机生成一个类似于“活动XX”的活动名称,XX为0到99之间的随机整数 | ||
| 38 | - vo.setStartTime(LocalDateTime.now()); // 随机生成一个在过去的一年内的开始时间(以毫秒为单位) | ||
| 39 | - vo.setEndTime(LocalDateTime.now()); // 随机生成一个在未来的一年内的结束时间(以毫秒为单位) | ||
| 40 | - randomList.add(vo); | 44 | + List<AppActivityRespVO> respList = new ArrayList<>(); |
| 45 | + CombinationActivityDO combination = combinationActivityService.getCombinationActivityBySpuId(spuId); | ||
| 46 | + if (combination != null) { | ||
| 47 | + respList.add(new AppActivityRespVO() | ||
| 48 | + .setId(combination.getId()) | ||
| 49 | + .setType(PromotionTypeEnum.COMBINATION_ACTIVITY.getType()) | ||
| 50 | + .setName(combination.getName()) | ||
| 51 | + .setStartTime(combination.getStartTime()) | ||
| 52 | + .setEndTime(combination.getEndTime())); | ||
| 53 | + } | ||
| 54 | + SeckillActivityDO seckill = seckillActivityService.getSeckillActivityBySpuId(spuId); | ||
| 55 | + if (seckill != null) { | ||
| 56 | + respList.add(new AppActivityRespVO() | ||
| 57 | + .setId(seckill.getId()) | ||
| 58 | + .setType(PromotionTypeEnum.SECKILL_ACTIVITY.getType()) | ||
| 59 | + .setName(seckill.getName()) | ||
| 60 | + .setStartTime(seckill.getStartTime()) | ||
| 61 | + .setEndTime(seckill.getEndTime())); | ||
| 62 | + } | ||
| 63 | + BargainActivityDO bargain = bargainActivityService.getBargainActivityBySpuId(spuId); | ||
| 64 | + if (bargain != null) { | ||
| 65 | + respList.add(new AppActivityRespVO() | ||
| 66 | + .setId(bargain.getId()) | ||
| 67 | + .setType(PromotionTypeEnum.BARGAIN_ACTIVITY.getType()) | ||
| 68 | + .setName(bargain.getName()) | ||
| 69 | + .setStartTime(bargain.getStartTime()) | ||
| 70 | + .setEndTime(bargain.getEndTime())); | ||
| 41 | } | 71 | } |
| 42 | - return success(randomList); | 72 | + return success(respList); |
| 43 | } | 73 | } |
| 44 | 74 | ||
| 45 | // TODO @puhui999:可以实现下 | 75 | // TODO @puhui999:可以实现下 |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java
| @@ -83,4 +83,11 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> { | @@ -83,4 +83,11 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> { | ||
| 83 | .last("LIMIT " + count)); | 83 | .last("LIMIT " + count)); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | + default BargainActivityDO selectOne(Long spuId) { | ||
| 87 | + return selectOne(new LambdaQueryWrapperX<BargainActivityDO>() | ||
| 88 | + .eq(BargainActivityDO::getSpuId, spuId) | ||
| 89 | + .orderByDesc(BargainActivityDO::getCreateTime) | ||
| 90 | + , false); | ||
| 91 | + } | ||
| 92 | + | ||
| 86 | } | 93 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
| @@ -40,4 +40,11 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi | @@ -40,4 +40,11 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi | ||
| 40 | .last("LIMIT " + count)); | 40 | .last("LIMIT " + count)); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | + default CombinationActivityDO selectOne(Long spuId) { | ||
| 44 | + return selectOne(new LambdaQueryWrapperX<CombinationActivityDO>() | ||
| 45 | + .eq(CombinationActivityDO::getSpuId, spuId) | ||
| 46 | + .orderByDesc(CombinationActivityDO::getCreateTime) | ||
| 47 | + , false); | ||
| 48 | + } | ||
| 49 | + | ||
| 43 | } | 50 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
| @@ -56,4 +56,11 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> { | @@ -56,4 +56,11 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> { | ||
| 56 | .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0")); | 56 | .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0")); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | + default SeckillActivityDO selectOne(Long spuId) { | ||
| 60 | + return selectOne(new LambdaQueryWrapperX<SeckillActivityDO>() | ||
| 61 | + .eq(SeckillActivityDO::getSpuId, spuId) | ||
| 62 | + .orderByDesc(SeckillActivityDO::getCreateTime) | ||
| 63 | + , false); | ||
| 64 | + } | ||
| 65 | + | ||
| 59 | } | 66 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
| @@ -98,4 +98,12 @@ public interface BargainActivityService { | @@ -98,4 +98,12 @@ public interface BargainActivityService { | ||
| 98 | */ | 98 | */ |
| 99 | List<BargainActivityDO> getBargainActivityListByCount(Integer count); | 99 | List<BargainActivityDO> getBargainActivityListByCount(Integer count); |
| 100 | 100 | ||
| 101 | + /** | ||
| 102 | + * 获取指定 spu 编号的活动 | ||
| 103 | + * | ||
| 104 | + * @param spuId spu 编号 | ||
| 105 | + * @return 砍价活动 | ||
| 106 | + */ | ||
| 107 | + BargainActivityDO getBargainActivityBySpuId(Long spuId); | ||
| 108 | + | ||
| 101 | } | 109 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
| @@ -175,4 +175,9 @@ public class BargainActivityServiceImpl implements BargainActivityService { | @@ -175,4 +175,9 @@ public class BargainActivityServiceImpl implements BargainActivityService { | ||
| 175 | return bargainActivityMapper.selectList(count, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()); | 175 | return bargainActivityMapper.selectList(count, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()); |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | + @Override | ||
| 179 | + public BargainActivityDO getBargainActivityBySpuId(Long spuId) { | ||
| 180 | + return bargainActivityMapper.selectOne(spuId); | ||
| 181 | + } | ||
| 182 | + | ||
| 178 | } | 183 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
| @@ -109,4 +109,12 @@ public interface CombinationActivityService { | @@ -109,4 +109,12 @@ public interface CombinationActivityService { | ||
| 109 | */ | 109 | */ |
| 110 | CombinationProductDO selectByActivityIdAndSkuId(Long activityId, Long skuId); | 110 | CombinationProductDO selectByActivityIdAndSkuId(Long activityId, Long skuId); |
| 111 | 111 | ||
| 112 | + /** | ||
| 113 | + * 获取指定 spu 编号的活动 | ||
| 114 | + * | ||
| 115 | + * @param spuId spu 编号 | ||
| 116 | + * @return 拼团商品 | ||
| 117 | + */ | ||
| 118 | + CombinationActivityDO getCombinationActivityBySpuId(Long spuId); | ||
| 119 | + | ||
| 112 | } | 120 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
| @@ -223,4 +223,9 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic | @@ -223,4 +223,9 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic | ||
| 223 | CombinationProductDO::getSkuId, skuId); | 223 | CombinationProductDO::getSkuId, skuId); |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | + @Override | ||
| 227 | + public CombinationActivityDO getCombinationActivityBySpuId(Long spuId) { | ||
| 228 | + return combinationActivityMapper.selectOne(spuId); | ||
| 229 | + } | ||
| 230 | + | ||
| 226 | } | 231 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
| @@ -119,4 +119,12 @@ public interface SeckillActivityService { | @@ -119,4 +119,12 @@ public interface SeckillActivityService { | ||
| 119 | */ | 119 | */ |
| 120 | SeckillValidateJoinRespDTO validateJoinSeckill(Long activityId, Long skuId, Integer count); | 120 | SeckillValidateJoinRespDTO validateJoinSeckill(Long activityId, Long skuId, Integer count); |
| 121 | 121 | ||
| 122 | + /** | ||
| 123 | + * 获取指定 spu 编号的活动 | ||
| 124 | + * | ||
| 125 | + * @param spuId spu 编号 | ||
| 126 | + * @return 秒杀商品 | ||
| 127 | + */ | ||
| 128 | + SeckillActivityDO getSeckillActivityBySpuId(Long spuId); | ||
| 129 | + | ||
| 122 | } | 130 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
| @@ -310,4 +310,9 @@ public class SeckillActivityServiceImpl implements SeckillActivityService { | @@ -310,4 +310,9 @@ public class SeckillActivityServiceImpl implements SeckillActivityService { | ||
| 310 | return SeckillActivityConvert.INSTANCE.convert02(activity, product); | 310 | return SeckillActivityConvert.INSTANCE.convert02(activity, product); |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | + @Override | ||
| 314 | + public SeckillActivityDO getSeckillActivityBySpuId(Long spuId) { | ||
| 315 | + return seckillActivityMapper.selectOne(spuId); | ||
| 316 | + } | ||
| 317 | + | ||
| 313 | } | 318 | } |