Commit e47b3f0aabd2a18f60a7326109ea33e34b091673
1 parent
9805f9f5
【功能】完成满减送关闭的功能
Showing
2 changed files
with
42 additions
and
3 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/reward/RewardActivityConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.promotion.convert.reward; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO; | |
| 5 | +import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO; | |
| 6 | +import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityRespVO; | |
| 7 | +import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO; | |
| 8 | +import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO; | |
| 9 | +import org.mapstruct.Mapper; | |
| 10 | +import org.mapstruct.factory.Mappers; | |
| 11 | + | |
| 12 | +import java.util.List; | |
| 13 | + | |
| 14 | +/** | |
| 15 | + * 满减送活动 Convert | |
| 16 | + * | |
| 17 | + * @author 芋道源码 | |
| 18 | + */ | |
| 19 | +@Mapper | |
| 20 | +public interface RewardActivityConvert { | |
| 21 | + | |
| 22 | + RewardActivityConvert INSTANCE = Mappers.getMapper(RewardActivityConvert.class); | |
| 23 | + | |
| 24 | + RewardActivityDO convert(RewardActivityCreateReqVO bean); | |
| 25 | + | |
| 26 | + RewardActivityDO convert(RewardActivityUpdateReqVO bean); | |
| 27 | + | |
| 28 | + RewardActivityRespVO convert(RewardActivityDO bean); | |
| 29 | + | |
| 30 | + PageResult<RewardActivityRespVO> convertPage(PageResult<RewardActivityDO> page); | |
| 31 | + | |
| 32 | + List<RewardActivityMatchRespDTO> convertList(List<RewardActivityDO> rewardActivityBySpuIdsAndStatusAndDateTimeLt); | |
| 33 | +} | ... | ... |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
| ... | ... | @@ -11,8 +11,10 @@ import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivi |
| 11 | 11 | import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO; |
| 12 | 12 | import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO; |
| 13 | 13 | import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO; |
| 14 | +import cn.iocoder.yudao.module.promotion.convert.reward.RewardActivityConvert; | |
| 14 | 15 | import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO; |
| 15 | 16 | import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper; |
| 17 | +import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum; | |
| 16 | 18 | import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum; |
| 17 | 19 | import cn.iocoder.yudao.module.promotion.util.PromotionUtils; |
| 18 | 20 | import jakarta.annotation.Resource; |
| ... | ... | @@ -52,9 +54,13 @@ public class RewardActivityServiceImpl implements RewardActivityService { |
| 52 | 54 | // 1.2 校验商品是否冲突 |
| 53 | 55 | validateRewardActivitySpuConflicts(null, createReqVO); |
| 54 | 56 | |
| 55 | - // 2. 插入 | |
| 56 | - RewardActivityDO rewardActivity = BeanUtils.toBean(createReqVO, RewardActivityDO.class) | |
| 57 | - .setStatus(PromotionUtils.calculateActivityStatus(createReqVO.getEndTime())); | |
| 57 | + // 插入 | |
| 58 | + RewardActivityDO rewardActivity = RewardActivityConvert.INSTANCE.convert(createReqVO) | |
| 59 | + .setStatus( | |
| 60 | + PromotionUtils.calculateActivityStatus(createReqVO.getEndTime()).equals(CommonStatusEnum.DISABLE.getStatus())? | |
| 61 | + PromotionActivityStatusEnum.WAIT.getStatus(): | |
| 62 | + PromotionActivityStatusEnum.RUN.getStatus() | |
| 63 | + ); | |
| 58 | 64 | rewardActivityMapper.insert(rewardActivity); |
| 59 | 65 | // 返回 |
| 60 | 66 | return rewardActivity.getId(); | ... | ... |