promotion：增加满减送活动的排重校验、单元测试

2025-08-15 18:51:54 +08:00 · 2022-11-05 09:57:45 +08:00
parent 74b6ff1eef
commit 79304b3a73
11 changed files with 228 additions and 88 deletions
--- a/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/rewardactivity/RewardActivityServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/rewardactivity/RewardActivityServiceImplTest.java
@@ -1,25 +1,29 @@
-package cn.iocoder.yudao.module.promotion.service.rewardactivity;
+package cn.iocoder.yudao.module.promotion.service.reward;

-import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityServiceImpl;
-import org.junit.jupiter.api.Disabled;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
+import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
 import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;

 import javax.annotation.Resource;
+import java.time.Duration;

-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.*;
-import cn.iocoder.yudao.module.promotion.dal.dataobject.rewardactivity.RewardActivityDO;
-import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-import java.util.*;
-
-import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.REWARD_ACTIVITY_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;

 /**
@@ -39,15 +43,24 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
    @Test
    public void testCreateRewardActivity_success() {
        // 准备参数
-        RewardActivityCreateReqVO reqVO = randomPojo(RewardActivityCreateReqVO.class);
+        RewardActivityCreateReqVO reqVO = randomPojo(RewardActivityCreateReqVO.class, o -> {
+            o.setConditionType(randomEle(PromotionConditionTypeEnum.values()).getType());
+            o.setProductScope(randomEle(PromotionProductScopeEnum.values()).getScope());
+            // 用于触发进行中的状态
+            o.setStartTime(addTime(Duration.ofDays(1))).setEndTime(addTime(Duration.ofDays(2)));
+        });

        // 调用
-        Integer rewardActivityId = rewardActivityService.createRewardActivity(reqVO);
+        Long rewardActivityId = rewardActivityService.createRewardActivity(reqVO);
        // 断言
        assertNotNull(rewardActivityId);
        // 校验记录的属性是否正确
        RewardActivityDO rewardActivity = rewardActivityMapper.selectById(rewardActivityId);
-        assertPojoEquals(reqVO, rewardActivity);
+        assertPojoEquals(reqVO, rewardActivity, "rules");
+        assertEquals(rewardActivity.getStatus(), PromotionActivityStatusEnum.WAIT.getStatus());
+        for (int i = 0; i < reqVO.getRules().size(); i++) {
+            assertPojoEquals(reqVO.getRules().get(i), rewardActivity.getRules().get(i));
+        }
    }

    @Test
@@ -58,13 +71,21 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
        // 准备参数
        RewardActivityUpdateReqVO reqVO = randomPojo(RewardActivityUpdateReqVO.class, o -> {
            o.setId(dbRewardActivity.getId()); // 设置更新的 ID
+            o.setConditionType(randomEle(PromotionConditionTypeEnum.values()).getType());
+            o.setProductScope(randomEle(PromotionProductScopeEnum.values()).getScope());
+            // 用于触发进行中的状态
+            o.setStartTime(addTime(Duration.ofDays(1))).setEndTime(addTime(Duration.ofDays(2)));
        });

        // 调用
        rewardActivityService.updateRewardActivity(reqVO);
        // 校验是否更新正确
        RewardActivityDO rewardActivity = rewardActivityMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, rewardActivity);
+        assertPojoEquals(reqVO, rewardActivity, "rules");
+        assertEquals(rewardActivity.getStatus(), PromotionActivityStatusEnum.WAIT.getStatus());
+        for (int i = 0; i < reqVO.getRules().size(); i++) {
+            assertPojoEquals(reqVO.getRules().get(i), rewardActivity.getRules().get(i));
+        }
    }

    @Test
@@ -82,7 +103,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
        RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class);
        rewardActivityMapper.insert(dbRewardActivity);// @Sql: 先插入出一条存在的数据
        // 准备参数
-        Integer id = dbRewardActivity.getId();
+        Long id = dbRewardActivity.getId();

        // 调用
        rewardActivityService.deleteRewardActivity(id);
@@ -93,61 +114,35 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
    @Test
    public void testDeleteRewardActivity_notExists() {
        // 准备参数
-        Integer id = randomIntegerId();
+        Long id = randomLongId();

        // 调用, 并断言异常
        assertServiceException(() -> rewardActivityService.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
    }

    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
    public void testGetRewardActivityPage() {
       // mock 数据
       RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setStatus(null);
+           o.setName("芋艿");
+           o.setStatus(PromotionActivityStatusEnum.CLOSE.getStatus());
       });
       rewardActivityMapper.insert(dbRewardActivity);
       // 测试 name 不匹配
-       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setName(null)));
+       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setName("土豆")));
       // 测试 status 不匹配
-       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setStatus(null)));
+       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setStatus(PromotionActivityStatusEnum.RUN.getStatus())));
       // 准备参数
       RewardActivityPageReqVO reqVO = new RewardActivityPageReqVO();
-       reqVO.setName(null);
-       reqVO.setStatus(null);
+       reqVO.setName("芋艿");
+       reqVO.setStatus(PromotionActivityStatusEnum.CLOSE.getStatus());

       // 调用
       PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(reqVO);
       // 断言
       assertEquals(1, pageResult.getTotal());
       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbRewardActivity, pageResult.getList().get(0));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetRewardActivityList() {
-       // mock 数据
-       RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setStatus(null);
-       });
-       rewardActivityMapper.insert(dbRewardActivity);
-       // 测试 name 不匹配
-       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setName(null)));
-       // 测试 status 不匹配
-       rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setStatus(null)));
-       // 准备参数
-       RewardActivityExportReqVO reqVO = new RewardActivityExportReqVO();
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-
-       // 调用
-       List<RewardActivityDO> list = rewardActivityService.getRewardActivityList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbRewardActivity, list.get(0));
+       assertPojoEquals(dbRewardActivity, pageResult.getList().get(0), "rules");
    }

 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/clean.sql
@@ -1,2 +1,4 @@
 DELETE FROM "market_activity";
 DELETE FROM "promotion_coupon_template";
+DELETE FROM "promotion_coupon";
+DELETE FROM "promotion_reward_activity";
--- a/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/create_tables.sql
@@ -46,3 +46,48 @@ CREATE TABLE IF NOT EXISTS "promotion_coupon_template" (
   "deleted" bit NOT NULL DEFAULT FALSE,
   PRIMARY KEY ("id")
 ) COMMENT '优惠劵模板';
+
+CREATE TABLE IF NOT EXISTS "promotion_coupon" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "template_id" bigint NOT NULL,
+    "name" varchar NOT NULL,
+    "status" int NOT NULL,
+    "user_id" bigint NOT NULL,
+    "take_type" int NOT NULL,
+    "useprice" int NOT NULL,
+    "valid_start_time" datetime NOT NULL,
+    "valid_end_time" datetime NOT NULL,
+    "product_scope" int NOT NULL,
+    "product_spu_ids" varchar,
+    "discount_type" int NOT NULL,
+    "discount_percent" int,
+    "discount_price" int,
+    "discount_limit_price" int,
+    "use_order_id" bigint,
+    "use_time" datetime,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
+) COMMENT '优惠劵';
+
+CREATE TABLE IF NOT EXISTS "promotion_reward_activity" (
+   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+   "name" varchar NOT NULL,
+   "status" int NOT NULL,
+   "start_time" datetime NOT NULL,
+   "end_time" datetime NOT NULL,
+   "remark" varchar,
+   "condition_type" int NOT NULL,
+   "product_scope" int NOT NULL,
+   "product_spu_ids" varchar,
+   "rules" varchar,
+   "creator" varchar DEFAULT '',
+   "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+   "updater" varchar DEFAULT '',
+   "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   "deleted" bit NOT NULL DEFAULT FALSE,
+   PRIMARY KEY ("id")
+) COMMENT '满减送活动';