BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b094c35eaaca238de0a20d7e90da38bfc1a070cd

Authored by 芋道源码
Committed by Gitee
2 parents 15f46db7 1352613e

!1080 【代码优化】商城: 满减送活动 

Merge pull request !1080 from puhui999/develop
Inline Side-by-side
Showing 9 changed files with 133 additions and 136 deletions
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApi.java
  View file @b094c35
... ... @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.promotion.api.reward;
2 2  
3 3 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
4 4  
5   -import java.util.Collection;
  5 +import java.time.LocalDateTime;
6 6 import java.util.List;
7 7  
8 8 /**
... ... @@ -12,13 +12,13 @@ import java.util.List;
12 12 */
13 13 public interface RewardActivityApi {
14 14  
15   -
16 15 /**
17   - * 基于指定的 SPU 编号数组，获得它们匹配的满减送活动
  16 + * 获得当前时间内开启的满减送活动
18 17 *
19   - * @param spuIds SPU 编号数组
  18 + * @param status 状态
  19 + * @param dateTime 时间
20 20 * @return 满减送活动列表
21 21 */
22   - List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds);
  22 + List<RewardActivityMatchRespDTO> getRewardActivityListByStatusAndNow(Integer status, LocalDateTime dateTime);
23 23  
24 24 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
  View file @b094c35
... ... @@ -40,12 +40,12 @@ public interface ErrorCodeConstants {
40 40  
41 41 // ========== 满减送活动 1-013-006-000 ==========
42 42 ErrorCode REWARD_ACTIVITY_NOT_EXISTS = new ErrorCode(1_013_006_000, "满减送活动不存在");
43   - ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_006_001, "存在商品参加了其它满减送活动");
  43 + ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_006_001, "该时间段存在商品参加了其它满减送活动");
44 44 ErrorCode REWARD_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_006_002, "满减送活动已关闭，不能修改");
45 45 ErrorCode REWARD_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1_013_006_003, "满减送活动未关闭，不能删除");
46 46 ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_006_004, "满减送活动已关闭，不能重复关闭");
47   - ErrorCode REWARD_ACTIVITY_SCOPE_ALL_EXISTS = new ErrorCode(1_013_006_005, "已存在商品范围为全场的满减送活动");
48   - ErrorCode REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS = new ErrorCode(1_013_006_006, "存在商品类型参加了其它满减送活动");
  47 + ErrorCode REWARD_ACTIVITY_SCOPE_ALL_EXISTS = new ErrorCode(1_013_006_005, "该时间段已存在商品范围为全场的满减送活动");
  48 + ErrorCode REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS = new ErrorCode(1_013_006_006, "该时间段存在商品类型参加了其它满减送活动");
49 49  
50 50 // ========== TODO 空着 1-013-007-000 ============
51 51  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApiImpl.java
  View file @b094c35
1 1 package cn.iocoder.yudao.module.promotion.api.reward;
2 2  
  3 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
3 4 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
  5 +import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
4 6 import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
  7 +import jakarta.annotation.Resource;
5 8 import org.springframework.stereotype.Service;
6 9 import org.springframework.validation.annotation.Validated;
7 10  
8   -import jakarta.annotation.Resource;
9   -import java.util.Collection;
  11 +import java.time.LocalDateTime;
10 12 import java.util.List;
11 13  
12 14 /**
... ... @@ -22,8 +24,9 @@ public class RewardActivityApiImpl implements RewardActivityApi {
22 24 private RewardActivityService rewardActivityService;
23 25  
24 26 @Override
25   - public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
26   - return rewardActivityService.getMatchRewardActivityList(spuIds);
  27 + public List<RewardActivityMatchRespDTO> getRewardActivityListByStatusAndNow(Integer status, LocalDateTime dateTime) {
  28 + List<RewardActivityDO> list = rewardActivityService.getRewardActivityListByStatusAndDateTimeLt(status, dateTime);
  29 + return BeanUtils.toBean(list, RewardActivityMatchRespDTO.class);
27 30 }
28 31  
29 32 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/reward/RewardActivityMapper.java
  View file @b094c35
1 1 package cn.iocoder.yudao.module.promotion.dal.mysql.reward;
2 2  
3   -import cn.hutool.core.util.StrUtil;
4 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 6 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
8 7 import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
9   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 8 import org.apache.ibatis.annotations.Mapper;
11 9  
12 10 import java.time.LocalDateTime;
13   -import java.util.Collection;
14 11 import java.util.List;
15   -import java.util.function.Function;
16   -import java.util.stream.Collectors;
17 12  
18 13 /**
19 14 * 满减送活动 Mapper
... ... @@ -30,29 +25,6 @@ public interface RewardActivityMapper extends BaseMapperX&lt;RewardActivityDO&gt; {
30 25 .orderByDesc(RewardActivityDO::getId));
31 26 }
32 27  
33   - default List<RewardActivityDO> selectListByProductScopeAndStatus(Integer productScope, Integer status) {
34   - return selectList(new LambdaQueryWrapperX<RewardActivityDO>()
35   - .eq(RewardActivityDO::getProductScope, productScope)
36   - .eq(RewardActivityDO::getStatus, status));
37   - }
38   -
39   - default List<RewardActivityDO> selectListBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) {
40   - Function<Collection<Long>, String> productScopeValuesFindInSetFunc = ids -> ids.stream()
41   - .map(id -> StrUtil.format("FIND_IN_SET({}, product_spu_ids) ", id))
42   - .collect(Collectors.joining(" OR "));
43   - return selectList(new QueryWrapper<RewardActivityDO>()
44   - .eq("status", status)
45   - .apply(productScopeValuesFindInSetFunc.apply(spuIds)));
46   - }
47   -
48   - /**
49   - * 获取指定活动编号的活动列表且
50   - * 开始时间和结束时间小于给定时间 dateTime 的活动列表
51   - *
52   - * @param status 状态
53   - * @param dateTime 指定日期
54   - * @return 活动列表
55   - */
56 28 default List<RewardActivityDO> selectListByStatusAndDateTimeLt(Integer status, LocalDateTime dateTime) {
57 29 return selectList(new LambdaQueryWrapperX<RewardActivityDO>()
58 30 .eq(RewardActivityDO::getStatus, status)
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
  View file @b094c35
1 1 package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
5 4 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
6 5 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
7 6 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
... ... @@ -9,7 +8,6 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
9 8 import jakarta.validation.Valid;
10 9  
11 10 import java.time.LocalDateTime;
12   -import java.util.Collection;
13 11 import java.util.List;
14 12  
15 13 /**
... ... @@ -65,15 +63,7 @@ public interface RewardActivityService {
65 63 PageResult<RewardActivityDO> getRewardActivityPage(RewardActivityPageReqVO pageReqVO);
66 64  
67 65 /**
68   - * 基于指定的 SPU 编号数组，获得它们匹配的满减送活动
69   - *
70   - * @param spuIds SPU 编号数组
71   - * @return 满减送活动列表
72   - */
73   - List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds);
74   -
75   - /**
76   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
  66 + * 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
77 67 *
78 68 * @param status 状态
79 69 * @param dateTime 当前日期时间
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
  View file @b094c35
1 1 package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
  3 +import cn.hutool.core.date.LocalDateTimeUtil;
3 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
6 7 import cn.iocoder.yudao.module.product.api.category.ProductCategoryApi;
7 8 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
8   -import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
9 9 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityBaseVO;
10 10 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
11 11 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
... ... @@ -19,13 +19,11 @@ import org.springframework.stereotype.Service;
19 19 import org.springframework.validation.annotation.Validated;
20 20  
21 21 import java.time.LocalDateTime;
22   -import java.util.Collection;
23 22 import java.util.List;
24 23 import java.util.Objects;
25 24  
26 25 import static cn.hutool.core.collection.CollUtil.intersectionDistinct;
27 26 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
28   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.anyMatch;
29 27 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
30 28  
31 29 /**
... ... @@ -87,8 +85,7 @@ public class RewardActivityServiceImpl implements RewardActivityService {
87 85 }
88 86  
89 87 // 更新
90   - RewardActivityDO updateObj = new RewardActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus());
91   - rewardActivityMapper.updateById(updateObj);
  88 + rewardActivityMapper.updateById(new RewardActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus()));
92 89 }
93 90  
94 91 @Override
... ... @@ -118,22 +115,29 @@ public class RewardActivityServiceImpl implements RewardActivityService {
118 115 * @param rewardActivity 请求
119 116 */
120 117 private void validateRewardActivitySpuConflicts(Long id, RewardActivityBaseVO rewardActivity) {
121   - List<RewardActivityDO> list = rewardActivityMapper.selectList(RewardActivityDO::getProductScope,
122   - rewardActivity.getProductScope(), RewardActivityDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
  118 + // 0. 获得开启的所有的活动
  119 + List<RewardActivityDO> list = rewardActivityMapper.selectList(RewardActivityDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
123 120 if (id != null) { // 排除自己这个活动
124 121 list.removeIf(activity -> id.equals(activity.getId()));
125 122 }
126 123  
127   - // 情况一：全部商品参加
128   - if (PromotionProductScopeEnum.isAll(rewardActivity.getProductScope()) && !list.isEmpty()) {
129   - throw exception(REWARD_ACTIVITY_SCOPE_ALL_EXISTS);
130   - }
131   - if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) || // 情况二：指定商品参加
132   - PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) { // 情况三：指定商品类型参加
133   - if (anyMatch(list, item -> !intersectionDistinct(item.getProductScopeValues(),
134   - rewardActivity.getProductScopeValues()).isEmpty())) {
135   - throw exception(PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) ?
136   - REWARD_ACTIVITY_SPU_CONFLICTS : REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS);
  124 + for (RewardActivityDO item : list) {
  125 + // 1.1 校验满减送活动时间是否冲突，如果时段不冲突那么不同的时间段内则可以存在相同的商品范围
  126 + if (!LocalDateTimeUtil.isOverlap(item.getStartTime(), item.getEndTime(),
  127 + rewardActivity.getStartTime(), rewardActivity.getEndTime())) {
  128 + continue;
  129 + }
  130 + // 1.2 校验商品范围是否重叠
  131 + if (PromotionProductScopeEnum.isAll(rewardActivity.getProductScope()) &&
  132 + PromotionProductScopeEnum.isAll(item.getProductScope())) { // 情况一：全部商品参加
  133 + throw exception(REWARD_ACTIVITY_SCOPE_ALL_EXISTS);
  134 + }
  135 + if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) || // 情况二：指定商品参加
  136 + PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) { // 情况三：指定商品类型参加
  137 + if (!intersectionDistinct(item.getProductScopeValues(), rewardActivity.getProductScopeValues()).isEmpty()) {
  138 + throw exception(PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) ?
  139 + REWARD_ACTIVITY_SPU_CONFLICTS : REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS);
  140 + }
137 141 }
138 142 }
139 143 }
... ... @@ -157,12 +161,6 @@ public class RewardActivityServiceImpl implements RewardActivityService {
157 161 }
158 162  
159 163 @Override
160   - public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
161   - List<RewardActivityDO> list = rewardActivityMapper.selectListBySpuIdsAndStatus(spuIds, CommonStatusEnum.ENABLE.getStatus());
162   - return BeanUtils.toBean(list, RewardActivityMatchRespDTO.class);
163   - }
164   -
165   - @Override
166 164 public List<RewardActivityDO> getRewardActivityListByStatusAndDateTimeLt(Integer status, LocalDateTime dateTime) {
167 165 return rewardActivityMapper.selectListByStatusAndDateTimeLt(status, dateTime);
168 166 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
  View file @b094c35
... ... @@ -2,8 +2,9 @@ package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
6   -import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
  5 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
  6 +import cn.iocoder.yudao.module.product.api.category.ProductCategoryApi;
  7 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
7 8 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
8 9 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
9 10 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
... ... @@ -11,15 +12,19 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
11 12 import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
12 13 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
13 14 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
14   -import jakarta.annotation.Resource;
15 15 import org.junit.jupiter.api.Disabled;
16 16 import org.junit.jupiter.api.Test;
17   -import org.springframework.context.annotation.Import;
  17 +import org.mockito.InjectMocks;
  18 +import org.mockito.Mock;
18 19  
19 20 import java.time.Duration;
  21 +import java.time.LocalDateTime;
  22 +import java.util.ArrayList;
  23 +import java.util.Collection;
20 24 import java.util.List;
21 25 import java.util.Set;
22 26  
  27 +import static cn.hutool.core.collection.CollUtil.intersectionDistinct;
23 28 import static cn.hutool.core.util.RandomUtil.randomEle;
24 29 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
25 30 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
... ... @@ -39,14 +44,17 @@ import static org.junit.jupiter.api.Assertions.*;
39 44 * @author 芋道源码
40 45 */
41 46 @Disabled // TODO 芋艿：后续 fix 补充的单测
42   -@Import(RewardActivityServiceImpl.class)
43   -public class RewardActivityServiceImplTest extends BaseDbUnitTest {
  47 +public class RewardActivityServiceImplTest extends BaseMockitoUnitTest {
44 48  
45   - @Resource
46   - private RewardActivityServiceImpl rewardActivityService;
  49 + @InjectMocks
  50 + private RewardActivityServiceImpl rewardActivityServiceImpl;
47 51  
48   - @Resource
  52 + @Mock
49 53 private RewardActivityMapper rewardActivityMapper;
  54 + @Mock
  55 + private ProductCategoryApi productCategoryApi;
  56 + @Mock
  57 + private ProductSpuApi productSpuApi;
50 58  
51 59 @Test
52 60 public void testCreateRewardActivity_success() {
... ... @@ -59,7 +67,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
59 67 });
60 68  
61 69 // 调用
62   - Long rewardActivityId = rewardActivityService.createRewardActivity(reqVO);
  70 + Long rewardActivityId = rewardActivityServiceImpl.createRewardActivity(reqVO);
63 71 // 断言
64 72 assertNotNull(rewardActivityId);
65 73 // 校验记录的属性是否正确
... ... @@ -86,7 +94,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
86 94 });
87 95  
88 96 // 调用
89   - rewardActivityService.updateRewardActivity(reqVO);
  97 + rewardActivityServiceImpl.updateRewardActivity(reqVO);
90 98 // 校验是否更新正确
91 99 RewardActivityDO rewardActivity = rewardActivityMapper.selectById(reqVO.getId()); // 获取最新的
92 100 assertPojoEquals(reqVO, rewardActivity, "rules");
... ... @@ -105,7 +113,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
105 113 Long id = dbRewardActivity.getId();
106 114  
107 115 // 调用
108   - rewardActivityService.closeRewardActivity(id);
  116 + rewardActivityServiceImpl.closeRewardActivity(id);
109 117 // 校验状态
110 118 RewardActivityDO rewardActivity = rewardActivityMapper.selectById(id);
111 119 assertEquals(rewardActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus());
... ... @@ -117,7 +125,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
117 125 RewardActivityUpdateReqVO reqVO = randomPojo(RewardActivityUpdateReqVO.class);
118 126  
119 127 // 调用, 并断言异常
120   - assertServiceException(() -> rewardActivityService.updateRewardActivity(reqVO), REWARD_ACTIVITY_NOT_EXISTS);
  128 + assertServiceException(() -> rewardActivityServiceImpl.updateRewardActivity(reqVO), REWARD_ACTIVITY_NOT_EXISTS);
121 129 }
122 130  
123 131 @Test
... ... @@ -129,7 +137,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
129 137 Long id = dbRewardActivity.getId();
130 138  
131 139 // 调用
132   - rewardActivityService.deleteRewardActivity(id);
  140 + rewardActivityServiceImpl.deleteRewardActivity(id);
133 141 // 校验数据不存在了
134 142 assertNull(rewardActivityMapper.selectById(id));
135 143 }
... ... @@ -140,7 +148,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
140 148 Long id = randomLongId();
141 149  
142 150 // 调用, 并断言异常
143   - assertServiceException(() -> rewardActivityService.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
  151 + assertServiceException(() -> rewardActivityServiceImpl.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
144 152 }
145 153  
146 154 @Test
... ... @@ -161,7 +169,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
161 169 reqVO.setStatus(CommonStatusEnum.DISABLE.getStatus());
162 170  
163 171 // 调用
164   - PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(reqVO);
  172 + PageResult<RewardActivityDO> pageResult = rewardActivityServiceImpl.getRewardActivityPage(reqVO);
165 173 // 断言
166 174 assertEquals(1, pageResult.getTotal());
167 175 assertEquals(1, pageResult.getList().size());
... ... @@ -170,18 +178,22 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
170 178  
171 179 @Test
172 180 public void testGetRewardActivities_all() {
  181 + LocalDateTime now = LocalDateTime.now();
173 182 // mock 数据
174 183 RewardActivityDO allActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
175   - .setProductScope(PromotionProductScopeEnum.ALL.getScope()));
  184 + .setProductScope(PromotionProductScopeEnum.ALL.getScope()).setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
176 185 rewardActivityMapper.insert(allActivity);
177 186 RewardActivityDO productActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
178   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L)));
  187 + .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  188 + .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
179 189 rewardActivityMapper.insert(productActivity);
180 190 // 准备参数
181 191 Set<Long> spuIds = asSet(1L, 2L);
182 192  
183   - // 调用 TODO getMatchRewardActivities 没有这个方法，但是找到了 getMatchRewardActivityList
184   - List<RewardActivityMatchRespDTO> matchRewardActivityList = rewardActivityService.getMatchRewardActivityList(spuIds);
  193 + // 调用
  194 + List<RewardActivityDO> activityList = rewardActivityServiceImpl.getRewardActivityListByStatusAndDateTimeLt(
  195 + CommonStatusEnum.ENABLE.getStatus(), now);
  196 + List<RewardActivityDO> matchRewardActivityList = filterMatchActivity(spuIds, activityList);
185 197 // 断言
186 198 assertEquals(matchRewardActivityList.size(), 1);
187 199 matchRewardActivityList.forEach((activity) -> {
... ... @@ -196,18 +208,22 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
196 208  
197 209 @Test
198 210 public void testGetRewardActivities_product() {
  211 + LocalDateTime now = LocalDateTime.now();
199 212 // mock 数据
200 213 RewardActivityDO productActivity01 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
201   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L)));
  214 + .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  215 + .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
202 216 rewardActivityMapper.insert(productActivity01);
203 217 RewardActivityDO productActivity02 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
204   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L)));
  218 + .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
  219 + .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
205 220 rewardActivityMapper.insert(productActivity02);
206 221 // 准备参数
207 222 Set<Long> spuIds = asSet(1L, 2L, 3L);
208 223  
209   - // 调用 TODO getMatchRewardActivities 没有这个方法，但是找到了 getMatchRewardActivityList
210   - List<RewardActivityMatchRespDTO> matchRewardActivityList = rewardActivityService.getMatchRewardActivityList(spuIds);
  224 + List<RewardActivityDO> activityList = rewardActivityServiceImpl.getRewardActivityListByStatusAndDateTimeLt(
  225 + CommonStatusEnum.ENABLE.getStatus(), now);
  226 + List<RewardActivityDO> matchRewardActivityList = filterMatchActivity(spuIds, activityList);
211 227 // 断言
212 228 assertEquals(matchRewardActivityList.size(), 2);
213 229 matchRewardActivityList.forEach((activity) -> {
... ... @@ -223,4 +239,27 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
223 239 });
224 240 }
225 241  
  242 + /**
  243 + * 获得满减送的订单项（商品）列表
  244 + *
  245 + * @param spuIds 商品编号
  246 + * @param activityList 活动列表
  247 + * @return 订单项（商品）列表
  248 + */
  249 + private List<RewardActivityDO> filterMatchActivity(Collection<Long> spuIds, List<RewardActivityDO> activityList) {
  250 + List<RewardActivityDO> resultActivityList = new ArrayList<>();
  251 + for (RewardActivityDO activity : activityList) {
  252 + // 情况一：全部商品都可以参与
  253 + if (PromotionProductScopeEnum.isAll(activity.getProductScope())) {
  254 + resultActivityList.add(activity);
  255 + }
  256 + // 情况二：指定商品参与
  257 + if (PromotionProductScopeEnum.isSpu(activity.getProductScope()) &&
  258 + !intersectionDistinct(activity.getProductScopeValues(), spuIds).isEmpty()) {
  259 + resultActivityList.add(activity);
  260 + }
  261 + }
  262 + return resultActivityList;
  263 + }
  264 +
226 265 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
  View file @b094c35
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.ObjectUtil;
5 5 import cn.hutool.core.util.StrUtil;
  6 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
6 7 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
7 8 import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
8 9 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
... ... @@ -16,12 +17,12 @@ import jakarta.annotation.Resource;
16 17 import org.springframework.core.annotation.Order;
17 18 import org.springframework.stereotype.Component;
18 19  
  20 +import java.time.LocalDateTime;
19 21 import java.util.ArrayList;
20 22 import java.util.Comparator;
21 23 import java.util.List;
22 24 import java.util.Map;
23 25  
24   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
25 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
26 27 import static cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper.formatPrice;
27 28  
... ... @@ -46,8 +47,8 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
46 47 return;
47 48 }
48 49 // 获得 SKU 对应的满减送活动
49   - List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getMatchRewardActivityList(
50   - convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSpuId));
  50 + List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getRewardActivityListByStatusAndNow(
  51 + CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
51 52 if (CollUtil.isEmpty(rewardActivities)) {
52 53 return;
53 54 }
... ... @@ -109,16 +110,8 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
109 110 // 4.3 记录赠送的优惠券
110 111 if (CollUtil.isNotEmpty(rule.getGiveCouponTemplateCounts())) {
111 112 for (Map.Entry<Long, Integer> entry : rule.getGiveCouponTemplateCounts().entrySet()) {
112   - Map<Long, Integer> giveCouponTemplateCounts = result.getGiveCouponTemplateCounts();
113   - // TODO @puhui999：是不是有一种可能性，这个 key 没有，别的 key 有哈。
114   - // TODO 这里还有一种简化的写法。就是下面，大概两行就可以啦
115   -// result.getGiveCouponTemplateCounts().put(entry.getKey(),
116   -// result.getGiveCouponTemplateCounts().getOrDefault(entry.getKey(), 0) + entry.getValue());
117   - if (giveCouponTemplateCounts.get(entry.getKey()) == null) { // 情况一：还没有赠送的优惠券
118   - result.setGiveCouponTemplateCounts(rule.getGiveCouponTemplateCounts());
119   - } else { // 情况二：别的满减活动送过同类优惠券，则直接增加数量
120   - giveCouponTemplateCounts.put(entry.getKey(), giveCouponTemplateCounts.get(entry.getKey()) + entry.getValue());
121   - }
  113 + result.getGiveCouponTemplateCounts().put(entry.getKey(),
  114 + result.getGiveCouponTemplateCounts().getOrDefault(entry.getKey(), 0) + entry.getValue());
122 115 }
123 116 }
124 117 }
... ... @@ -126,7 +119,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
126 119 /**
127 120 * 获得满减送的订单项（商品）列表
128 121 *
129   - * @param result 计算结果
  122 + * @param result 计算结果
130 123 * @param rewardActivity 满减送活动
131 124 * @return 订单项（商品）列表
132 125 */
... ... @@ -153,7 +146,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
153 146 * 获得最大匹配的满减送活动的规则
154 147 *
155 148 * @param rewardActivity 满减送活动
156   - * @param orderItems 商品项
  149 + * @param orderItems 商品项
157 150 * @return 匹配的活动规则
158 151 */
159 152 private RewardActivityMatchRespDTO.Rule getMaxMatchRewardActivityRule(RewardActivityMatchRespDTO rewardActivity,
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
  View file @b094c35
1 1 package cn.iocoder.yudao.module.trade.service.price.calculator;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4 5 import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
5 6 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
... ... @@ -13,15 +14,14 @@ import org.junit.jupiter.api.Test;
13 14 import org.mockito.InjectMocks;
14 15 import org.mockito.Mock;
15 16  
  17 +import java.time.LocalDateTime;
16 18 import java.util.ArrayList;
17 19 import java.util.LinkedHashMap;
18 20  
19   -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
20 21 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
21 22 import static java.util.Arrays.asList;
22 23 import static java.util.Collections.singletonList;
23 24 import static org.junit.jupiter.api.Assertions.*;
24   -import static org.mockito.ArgumentMatchers.eq;
25 25 import static org.mockito.Mockito.when;
26 26  
27 27 /**
... ... @@ -63,22 +63,23 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
63 63 TradePriceCalculatorHelper.recountAllPrice(result);
64 64  
65 65 // mock 方法（满减送 RewardActivity 信息）
66   - when(rewardActivityApi.getMatchRewardActivityList(eq(asSet(1L, 2L, 3L)))).thenReturn(asList(
67   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
68   - .setConditionType(PromotionConditionTypeEnum.PRICE.getType())
69   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
70   - .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(20).setDiscountPrice(70)
71   - .setFreeDelivery(false)))),
72   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(2000L).setName("活动 2000 号")
73   - .setConditionType(PromotionConditionTypeEnum.COUNT.getType())
74   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
75   - .setRules(asList(new RewardActivityMatchRespDTO.Rule().setLimit(1).setDiscountPrice(10)
76   - .setPoint(50).setFreeDelivery(false),
77   - new RewardActivityMatchRespDTO.Rule().setLimit(2).setDiscountPrice(60)
78   - .setPoint(100).setFreeDelivery(false), // 最大可满足，因为是 4 个
79   - new RewardActivityMatchRespDTO.Rule().setLimit(10).setDiscountPrice(100)
80   - .setFreeDelivery(false))))
81   - ));
  66 + when(rewardActivityApi.getRewardActivityListByStatusAndNow(CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()))
  67 + .thenReturn(asList(
  68 + randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
  69 + .setConditionType(PromotionConditionTypeEnum.PRICE.getType())
  70 + .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  71 + .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(20).setDiscountPrice(70)
  72 + .setFreeDelivery(false)))),
  73 + randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(2000L).setName("活动 2000 号")
  74 + .setConditionType(PromotionConditionTypeEnum.COUNT.getType())
  75 + .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
  76 + .setRules(asList(new RewardActivityMatchRespDTO.Rule().setLimit(1).setDiscountPrice(10)
  77 + .setPoint(50).setFreeDelivery(false),
  78 + new RewardActivityMatchRespDTO.Rule().setLimit(2).setDiscountPrice(60)
  79 + .setPoint(100).setFreeDelivery(false), // 最大可满足，因为是 4 个
  80 + new RewardActivityMatchRespDTO.Rule().setLimit(10).setDiscountPrice(100)
  81 + .setFreeDelivery(false))))
  82 + ));
82 83  
83 84 // 调用
84 85 tradeRewardActivityPriceCalculator.calculate(param, result);
... ... @@ -184,11 +185,12 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
184 185 TradePriceCalculatorHelper.recountAllPrice(result);
185 186  
186 187 // mock 方法（限时折扣 DiscountActivity 信息）
187   - when(rewardActivityApi.getMatchRewardActivityList(eq(asSet(1L, 2L)))).thenReturn(singletonList(
188   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
189   - .setProductScopeValues(asList(1L, 2L)).setConditionType(PromotionConditionTypeEnum.PRICE.getType())
190   - .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(351).setDiscountPrice(70))))
191   - ));
  188 + when(rewardActivityApi.getRewardActivityListByStatusAndNow(CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()))
  189 + .thenReturn(singletonList(
  190 + randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
  191 + .setProductScopeValues(asList(1L, 2L)).setConditionType(PromotionConditionTypeEnum.PRICE.getType())
  192 + .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(351).setDiscountPrice(70))))
  193 + ));
192 194  
193 195 // 调用
194 196 tradeRewardActivityPriceCalculator.calculate(param, result);
... ...