feat：mall CombinationActivity

yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java

@@ -151,7 +151,6 @@ public class ProductCommentServiceImplTest extends BaseDbUnitTest {
 
         // 测试分页 tab count
         AppCommentStatisticsRespVO tabsCount = productCommentService.getCommentStatistics(spuId, Boolean.TRUE);
-        assertEquals(6, tabsCount.getAllCount());
         assertEquals(4, tabsCount.getGoodCount());
         assertEquals(2, tabsCount.getMediocreCount());
         assertEquals(0, tabsCount.getNegativeCount());

yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java

@@ -59,4 +59,6 @@ public interface ErrorCodeConstants {
     ErrorCode SECKILL_TIME_EQUAL = new ErrorCode(1013009002, "秒杀时段开始时间和结束时间不能相等");
     ErrorCode SECKILL_START_TIME_BEFORE_END_TIME = new ErrorCode(1013009003, "秒杀时段开始时间不能在结束时间之后");
 
+    // ========== 拼团活动 1013010000 ==========
+    ErrorCode COMBINATION_ACTIVITY_NOT_EXISTS = new ErrorCode(1013010000, "拼团活动不存在");
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java

@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.*;
+import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivityConvert;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Tag(name = "管理后台 - 拼团活动")
+@RestController
+@RequestMapping("/promotion/combination-activity")
+@Validated
+public class CombinationActivityController {
+
+    @Resource
+    private CombinationActivityService combinationActivityService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建拼团活动")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:create')")
+    public CommonResult<Long> createCombinationActivity(@Valid @RequestBody CombinationActivityCreateReqVO createReqVO) {
+        return success(combinationActivityService.createCombinationActivity(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新拼团活动")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:update')")
+    public CommonResult<Boolean> updateCombinationActivity(@Valid @RequestBody CombinationActivityUpdateReqVO updateReqVO) {
+        combinationActivityService.updateCombinationActivity(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除拼团活动")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:delete')")
+    public CommonResult<Boolean> deleteCombinationActivity(@RequestParam("id") Long id) {
+        combinationActivityService.deleteCombinationActivity(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得拼团活动")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:query')")
+    public CommonResult<CombinationActivityRespVO> getCombinationActivity(@RequestParam("id") Long id) {
+        CombinationActivityDO combinationActivity = combinationActivityService.getCombinationActivity(id);
+        return success(CombinationActivityConvert.INSTANCE.convert(combinationActivity));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得拼团活动列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:query')")
+    public CommonResult<List<CombinationActivityRespVO>> getCombinationActivityList(@RequestParam("ids") Collection<Long> ids) {
+        List<CombinationActivityDO> list = combinationActivityService.getCombinationActivityList(ids);
+        return success(CombinationActivityConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得拼团活动分页")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:query')")
+    public CommonResult<PageResult<CombinationActivityRespVO>> getCombinationActivityPage(@Valid CombinationActivityPageReqVO pageVO) {
+        PageResult<CombinationActivityDO> pageResult = combinationActivityService.getCombinationActivityPage(pageVO);
+        return success(CombinationActivityConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出拼团活动 Excel")
+    @PreAuthorize("@ss.hasPermission('promotion:combination-activity:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCombinationActivityExcel(@Valid CombinationActivityExportReqVO exportReqVO,
+                                               HttpServletResponse response) throws IOException {
+        List<CombinationActivityDO> list = combinationActivityService.getCombinationActivityList(exportReqVO);
+        // 导出 Excel
+        List<CombinationActivityExcelVO> datas = CombinationActivityConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "拼团活动.xls", "数据", CombinationActivityExcelVO.class, datas);
+    }
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityBaseVO.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 拼团活动 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class CombinationActivityBaseVO {
+
+    @Schema(description = "拼团名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotNull(message = "拼团名称不能为空")
+    private String name;
+
+    @Schema(description = "商品 SPU 编号关联 ProductSpuDO 的 id", example = "14016")
+    private Long spuId;
+
+    @Schema(description = "总限购数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "16218")
+    @NotNull(message = "总限购数量不能为空")
+    private Integer totalLimitCount;
+
+    @Schema(description = "单次限购数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "28265")
+    @NotNull(message = "单次限购数量不能为空")
+    private Integer singleLimitCount;
+
+    @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "开始时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "结束时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime endTime;
+
+    @Schema(description = "购买人数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "购买人数不能为空")
+    private Integer userSize;
+
+    @Schema(description = "开团组数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "开团组数不能为空")
+    private Integer totalNum;
+
+    @Schema(description = "成团组数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "成团组数不能为空")
+    private Integer successNum;
+
+    @Schema(description = "参与人数", requiredMode = Schema.RequiredMode.REQUIRED, example = "25222")
+    @NotNull(message = "参与人数不能为空")
+    private Integer orderUserCount;
+
+    @Schema(description = "虚拟成团", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "虚拟成团不能为空")
+    private Integer virtualGroup;
+
+    @Schema(description = "活动状态：0开启 1关闭", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    @NotNull(message = "活动状态：0开启 1关闭不能为空")
+    private Integer status;
+
+    @Schema(description = "限制时长（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "限制时长（小时）不能为空")
+    private Integer limitDuration;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityCreateReqVO.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 拼团活动创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CombinationActivityCreateReqVO extends CombinationActivityBaseVO {
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityExcelVO.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 拼团活动 Excel VO
+ *
+ * @author HUIHUI
+ */
+@Data
+public class CombinationActivityExcelVO {
+
+    @ExcelProperty("活动编号")
+    private Long id;
+
+    @ExcelProperty("拼团名称")
+    private String name;
+
+    @ExcelProperty("商品 SPU 编号关联 ProductSpuDO 的 id")
+    private Long spuId;
+
+    @ExcelProperty("总限购数量")
+    private Integer totalLimitCount;
+
+    @ExcelProperty("单次限购数量")
+    private Integer singleLimitCount;
+
+    @ExcelProperty("开始时间")
+    private LocalDateTime startTime;
+
+    @ExcelProperty("结束时间")
+    private LocalDateTime endTime;
+
+    @ExcelProperty("购买人数")
+    private Integer userSize;
+
+    @ExcelProperty("开团组数")
+    private Integer totalNum;
+
+    @ExcelProperty("成团组数")
+    private Integer successNum;
+
+    @ExcelProperty("参与人数")
+    private Integer orderUserCount;
+
+    @ExcelProperty("虚拟成团")
+    private Integer virtualGroup;
+
+    @ExcelProperty(value = "活动状态：0开启 1关闭", converter = DictConvert.class)
+    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private Integer status;
+
+    @ExcelProperty("限制时长（小时）")
+    private Integer limitDuration;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityExportReqVO.java

@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 拼团活动 Excel 导出 Request VO，参数和 CombinationActivityPageReqVO 是一致的")
+@Data
+public class CombinationActivityExportReqVO {
+
+    @Schema(description = "拼团名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "商品 SPU 编号关联 ProductSpuDO 的 id", example = "14016")
+    private Long spuId;
+
+    @Schema(description = "总限购数量", example = "16218")
+    private Integer totalLimitCount;
+
+    @Schema(description = "单次限购数量", example = "28265")
+    private Integer singleLimitCount;
+
+    @Schema(description = "开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] startTime;
+
+    @Schema(description = "结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] endTime;
+
+    @Schema(description = "购买人数")
+    private Integer userSize;
+
+    @Schema(description = "开团组数")
+    private Integer totalNum;
+
+    @Schema(description = "成团组数")
+    private Integer successNum;
+
+    @Schema(description = "参与人数", example = "25222")
+    private Integer orderUserCount;
+
+    @Schema(description = "虚拟成团")
+    private Integer virtualGroup;
+
+    @Schema(description = "活动状态：0开启 1关闭", example = "0")
+    private Integer status;
+
+    @Schema(description = "限制时长（小时）")
+    private Integer limitDuration;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityPageReqVO.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 拼团活动分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CombinationActivityPageReqVO extends PageParam {
+
+    @Schema(description = "拼团名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "商品 SPU 编号关联 ProductSpuDO 的 id", example = "14016")
+    private Long spuId;
+
+    @Schema(description = "总限购数量", example = "16218")
+    private Integer totalLimitCount;
+
+    @Schema(description = "单次限购数量", example = "28265")
+    private Integer singleLimitCount;
+
+    @Schema(description = "开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] startTime;
+
+    @Schema(description = "结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] endTime;
+
+    @Schema(description = "购买人数")
+    private Integer userSize;
+
+    @Schema(description = "开团组数")
+    private Integer totalNum;
+
+    @Schema(description = "成团组数")
+    private Integer successNum;
+
+    @Schema(description = "参与人数", example = "25222")
+    private Integer orderUserCount;
+
+    @Schema(description = "虚拟成团")
+    private Integer virtualGroup;
+
+    @Schema(description = "活动状态：0开启 1关闭", example = "0")
+    private Integer status;
+
+    @Schema(description = "限制时长（小时）")
+    private Integer limitDuration;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 拼团活动 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CombinationActivityRespVO extends CombinationActivityBaseVO {
+
+    @Schema(description = "活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22901")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityUpdateReqVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.combination.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 拼团活动更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CombinationActivityUpdateReqVO extends CombinationActivityBaseVO {
+
+    @Schema(description = "活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22901")
+    @NotNull(message = "活动编号不能为空")
+    private Long id;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.promotion.convert.combination;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityCreateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityExcelVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityRespVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 拼团活动 Convert
+ *
+ * @author HUIHUI
+ */
+@Mapper
+public interface CombinationActivityConvert {
+
+    CombinationActivityConvert INSTANCE = Mappers.getMapper(CombinationActivityConvert.class);
+
+    CombinationActivityDO convert(CombinationActivityCreateReqVO bean);
+
+    CombinationActivityDO convert(CombinationActivityUpdateReqVO bean);
+
+    CombinationActivityRespVO convert(CombinationActivityDO bean);
+
+    List<CombinationActivityRespVO> convertList(List<CombinationActivityDO> list);
+
+    PageResult<CombinationActivityRespVO> convertPage(PageResult<CombinationActivityDO> page);
+
+    List<CombinationActivityExcelVO> convertList02(List<CombinationActivityDO> list);
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/combination/CombinationActivityDO.java

@@ -0,0 +1,87 @@
+package cn.iocoder.yudao.module.promotion.dal.dataobject.combination;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.internal.bind.v2.TODO;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 拼团活动 DO
+ *
+ * @author HUIHUI
+ */
+@TableName("promotion_combination_activity")
+@KeySequence("promotion_combination_activity_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CombinationActivityDO extends BaseDO {
+
+    /**
+     * 活动编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品 SPU 编号关联 ProductSpuDO 的 id
+     */
+    private Long spuId;
+    /**
+     * 总限购数量
+     */
+    private Integer totalLimitCount;
+    /**
+     * 单次限购数量
+     */
+    private Integer singleLimitCount;
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+    /**
+     * 购买人数
+     */
+    private Integer userSize;
+    /**
+     * 开团组数
+     */
+    private Integer totalNum;
+    /**
+     * 成团组数
+     */
+    private Integer successNum;
+    /**
+     * 参与人数
+     */
+    private Integer orderUserCount;
+    /**
+     * 虚拟成团
+     */
+    private Integer virtualGroup;
+    /**
+     * 活动状态：0开启 1关闭
+     * <p>
+     * 枚举 {@link TODO common_status 对应的类}
+     */
+    private Integer status;
+    /**
+     * 限制时长（小时）
+     */
+    private Integer limitDuration;
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java

@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.promotion.dal.mysql.combination;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityExportReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityPageReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 拼团活动 Mapper
+ *
+ * @author HUIHUI
+ */
+@Mapper
+public interface CombinationActivityMapper extends BaseMapperX<CombinationActivityDO> {
+
+    default PageResult<CombinationActivityDO> selectPage(CombinationActivityPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<CombinationActivityDO>()
+                .likeIfPresent(CombinationActivityDO::getName, reqVO.getName())
+                .eqIfPresent(CombinationActivityDO::getSpuId, reqVO.getSpuId())
+                .eqIfPresent(CombinationActivityDO::getTotalLimitCount, reqVO.getTotalLimitCount())
+                .eqIfPresent(CombinationActivityDO::getSingleLimitCount, reqVO.getSingleLimitCount())
+                .betweenIfPresent(CombinationActivityDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(CombinationActivityDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(CombinationActivityDO::getUserSize, reqVO.getUserSize())
+                .eqIfPresent(CombinationActivityDO::getTotalNum, reqVO.getTotalNum())
+                .eqIfPresent(CombinationActivityDO::getSuccessNum, reqVO.getSuccessNum())
+                .eqIfPresent(CombinationActivityDO::getOrderUserCount, reqVO.getOrderUserCount())
+                .eqIfPresent(CombinationActivityDO::getVirtualGroup, reqVO.getVirtualGroup())
+                .eqIfPresent(CombinationActivityDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(CombinationActivityDO::getLimitDuration, reqVO.getLimitDuration())
+                .betweenIfPresent(CombinationActivityDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CombinationActivityDO::getId));
+    }
+
+    default List<CombinationActivityDO> selectList(CombinationActivityExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
+                .likeIfPresent(CombinationActivityDO::getName, reqVO.getName())
+                .eqIfPresent(CombinationActivityDO::getSpuId, reqVO.getSpuId())
+                .eqIfPresent(CombinationActivityDO::getTotalLimitCount, reqVO.getTotalLimitCount())
+                .eqIfPresent(CombinationActivityDO::getSingleLimitCount, reqVO.getSingleLimitCount())
+                .betweenIfPresent(CombinationActivityDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(CombinationActivityDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(CombinationActivityDO::getUserSize, reqVO.getUserSize())
+                .eqIfPresent(CombinationActivityDO::getTotalNum, reqVO.getTotalNum())
+                .eqIfPresent(CombinationActivityDO::getSuccessNum, reqVO.getSuccessNum())
+                .eqIfPresent(CombinationActivityDO::getOrderUserCount, reqVO.getOrderUserCount())
+                .eqIfPresent(CombinationActivityDO::getVirtualGroup, reqVO.getVirtualGroup())
+                .eqIfPresent(CombinationActivityDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(CombinationActivityDO::getLimitDuration, reqVO.getLimitDuration())
+                .betweenIfPresent(CombinationActivityDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CombinationActivityDO::getId));
+    }
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java

@@ -0,0 +1,75 @@
+package cn.iocoder.yudao.module.promotion.service.combination;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityCreateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityExportReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 拼团活动 Service 接口
+ *
+ * @author HUIHUI
+ */
+public interface CombinationActivityService {
+
+    /**
+     * 创建拼团活动
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createCombinationActivity(@Valid CombinationActivityCreateReqVO createReqVO);
+
+    /**
+     * 更新拼团活动
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateCombinationActivity(@Valid CombinationActivityUpdateReqVO updateReqVO);
+
+    /**
+     * 删除拼团活动
+     *
+     * @param id 编号
+     */
+    void deleteCombinationActivity(Long id);
+
+    /**
+     * 获得拼团活动
+     *
+     * @param id 编号
+     * @return 拼团活动
+     */
+    CombinationActivityDO getCombinationActivity(Long id);
+
+    /**
+     * 获得拼团活动列表
+     *
+     * @param ids 编号
+     * @return 拼团活动列表
+     */
+    List<CombinationActivityDO> getCombinationActivityList(Collection<Long> ids);
+
+    /**
+     * 获得拼团活动分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 拼团活动分页
+     */
+    PageResult<CombinationActivityDO> getCombinationActivityPage(CombinationActivityPageReqVO pageReqVO);
+
+    /**
+     * 获得拼团活动列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 拼团活动列表
+     */
+    List<CombinationActivityDO> getCombinationActivityList(CombinationActivityExportReqVO exportReqVO);
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java

@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.promotion.service.combination;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityCreateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityExportReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivityConvert;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import cn.iocoder.yudao.module.promotion.dal.mysql.combination.CombinationActivityMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COMBINATION_ACTIVITY_NOT_EXISTS;
+
+/**
+ * 拼团活动 Service 实现类
+ *
+ * @author HUIHUI
+ */
+@Service
+@Validated
+public class CombinationActivityServiceImpl implements CombinationActivityService {
+
+    @Resource
+    private CombinationActivityMapper combinationActivityMapper;
+
+    @Override
+    public Long createCombinationActivity(CombinationActivityCreateReqVO createReqVO) {
+        // 插入
+        CombinationActivityDO combinationActivity = CombinationActivityConvert.INSTANCE.convert(createReqVO);
+        combinationActivityMapper.insert(combinationActivity);
+        // 返回
+        return combinationActivity.getId();
+    }
+
+    @Override
+    public void updateCombinationActivity(CombinationActivityUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateCombinationActivityExists(updateReqVO.getId());
+        // 更新
+        CombinationActivityDO updateObj = CombinationActivityConvert.INSTANCE.convert(updateReqVO);
+        combinationActivityMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteCombinationActivity(Long id) {
+        // 校验存在
+        validateCombinationActivityExists(id);
+        // 删除
+        combinationActivityMapper.deleteById(id);
+    }
+
+    private void validateCombinationActivityExists(Long id) {
+        if (combinationActivityMapper.selectById(id) == null) {
+            throw exception(COMBINATION_ACTIVITY_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public CombinationActivityDO getCombinationActivity(Long id) {
+        return combinationActivityMapper.selectById(id);
+    }
+
+    @Override
+    public List<CombinationActivityDO> getCombinationActivityList(Collection<Long> ids) {
+        return combinationActivityMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<CombinationActivityDO> getCombinationActivityPage(CombinationActivityPageReqVO pageReqVO) {
+        return combinationActivityMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<CombinationActivityDO> getCombinationActivityList(CombinationActivityExportReqVO exportReqVO) {
+        return combinationActivityMapper.selectList(exportReqVO);
+    }
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckillactivity/SeckillActivityServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.promotion.service.seckill.seckillactivity;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -26,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -109,13 +109,13 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
         // 过滤出所有 spuIds 有交集的活动
         List<SeckillActivityDO> doList = activityDOs.stream().filter(s -> {
             // 判断 spu 是否有交集
-            List<Long> spuIdsClone = ArrayUtil.clone(s.getSpuIds());
+            ArrayList<Long> spuIdsClone = CollUtil.newArrayList(s.getSpuIds());
             spuIdsClone.retainAll(spuIds);
             if (CollUtil.isEmpty(spuIdsClone)) {
                 return false;
             }
             // 判断秒杀时段是否有交集
-            List<Long> configIdsClone = ArrayUtil.clone(s.getConfigIds());
+            List<Long> configIdsClone = CollUtil.newArrayList(s.getConfigIds());
             configIdsClone.retainAll(configIds);
             return CollUtil.isNotEmpty(configIdsClone);
         }).collect(Collectors.toList());

yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java

@@ -0,0 +1,251 @@
+package cn.iocoder.yudao.module.promotion.service.combination;
+
+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.combination.vo.CombinationActivityCreateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityExportReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.CombinationActivityUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import cn.iocoder.yudao.module.promotion.dal.mysql.combination.CombinationActivityMapper;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+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.COMBINATION_ACTIVITY_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link CombinationActivityServiceImpl} 的单元测试类
+ *
+ * @author HUIHUI
+ */
+@Import(CombinationActivityServiceImpl.class)
+public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private CombinationActivityServiceImpl combinationActivityService;
+
+    @Resource
+    private CombinationActivityMapper combinationActivityMapper;
+
+    @Test
+    public void testCreateCombinationActivity_success() {
+        // 准备参数
+        CombinationActivityCreateReqVO reqVO = randomPojo(CombinationActivityCreateReqVO.class);
+
+        // 调用
+        Long combinationActivityId = combinationActivityService.createCombinationActivity(reqVO);
+        // 断言
+        assertNotNull(combinationActivityId);
+        // 校验记录的属性是否正确
+        CombinationActivityDO combinationActivity = combinationActivityMapper.selectById(combinationActivityId);
+        assertPojoEquals(reqVO, combinationActivity);
+    }
+
+    @Test
+    public void testUpdateCombinationActivity_success() {
+        // mock 数据
+        CombinationActivityDO dbCombinationActivity = randomPojo(CombinationActivityDO.class);
+        combinationActivityMapper.insert(dbCombinationActivity);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        CombinationActivityUpdateReqVO reqVO = randomPojo(CombinationActivityUpdateReqVO.class, o -> {
+            o.setId(dbCombinationActivity.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        combinationActivityService.updateCombinationActivity(reqVO);
+        // 校验是否更新正确
+        CombinationActivityDO combinationActivity = combinationActivityMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, combinationActivity);
+    }
+
+    @Test
+    public void testUpdateCombinationActivity_notExists() {
+        // 准备参数
+        CombinationActivityUpdateReqVO reqVO = randomPojo(CombinationActivityUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> combinationActivityService.updateCombinationActivity(reqVO), COMBINATION_ACTIVITY_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteCombinationActivity_success() {
+        // mock 数据
+        CombinationActivityDO dbCombinationActivity = randomPojo(CombinationActivityDO.class);
+        combinationActivityMapper.insert(dbCombinationActivity);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbCombinationActivity.getId();
+
+        // 调用
+        combinationActivityService.deleteCombinationActivity(id);
+        // 校验数据不存在了
+        assertNull(combinationActivityMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteCombinationActivity_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> combinationActivityService.deleteCombinationActivity(id), COMBINATION_ACTIVITY_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetCombinationActivityPage() {
+        // mock 数据
+        CombinationActivityDO dbCombinationActivity = randomPojo(CombinationActivityDO.class, o -> { // 等会查询到
+            o.setName(null);
+            o.setSpuId(null);
+            o.setTotalLimitCount(null);
+            o.setSingleLimitCount(null);
+            o.setStartTime(null);
+            o.setEndTime(null);
+            o.setUserSize(null);
+            o.setTotalNum(null);
+            o.setSuccessNum(null);
+            o.setOrderUserCount(null);
+            o.setVirtualGroup(null);
+            o.setStatus(null);
+            o.setLimitDuration(null);
+            o.setCreateTime(null);
+        });
+        combinationActivityMapper.insert(dbCombinationActivity);
+        // 测试 name 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setName(null)));
+        // 测试 spuId 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSpuId(null)));
+        // 测试 totalLimitCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalLimitCount(null)));
+        // 测试 singleLimitCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSingleLimitCount(null)));
+        // 测试 startTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setStartTime(null)));
+        // 测试 endTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setEndTime(null)));
+        // 测试 userSize 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setUserSize(null)));
+        // 测试 totalNum 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalNum(null)));
+        // 测试 successNum 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessNum(null)));
+        // 测试 orderUserCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setOrderUserCount(null)));
+        // 测试 virtualGroup 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setVirtualGroup(null)));
+        // 测试 status 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setStatus(null)));
+        // 测试 limitDuration 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setLimitDuration(null)));
+        // 测试 createTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setCreateTime(null)));
+        // 准备参数
+        CombinationActivityPageReqVO reqVO = new CombinationActivityPageReqVO();
+        reqVO.setName(null);
+        reqVO.setSpuId(null);
+        reqVO.setTotalLimitCount(null);
+        reqVO.setSingleLimitCount(null);
+        reqVO.setStartTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setEndTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setUserSize(null);
+        reqVO.setTotalNum(null);
+        reqVO.setSuccessNum(null);
+        reqVO.setOrderUserCount(null);
+        reqVO.setVirtualGroup(null);
+        reqVO.setStatus(null);
+        reqVO.setLimitDuration(null);
+        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+        // 调用
+        PageResult<CombinationActivityDO> pageResult = combinationActivityService.getCombinationActivityPage(reqVO);
+        // 断言
+        assertEquals(1, pageResult.getTotal());
+        assertEquals(1, pageResult.getList().size());
+        assertPojoEquals(dbCombinationActivity, pageResult.getList().get(0));
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetCombinationActivityList() {
+        // mock 数据
+        CombinationActivityDO dbCombinationActivity = randomPojo(CombinationActivityDO.class, o -> { // 等会查询到
+            o.setName(null);
+            o.setSpuId(null);
+            o.setTotalLimitCount(null);
+            o.setSingleLimitCount(null);
+            o.setStartTime(null);
+            o.setEndTime(null);
+            o.setUserSize(null);
+            o.setTotalNum(null);
+            o.setSuccessNum(null);
+            o.setOrderUserCount(null);
+            o.setVirtualGroup(null);
+            o.setStatus(null);
+            o.setLimitDuration(null);
+            o.setCreateTime(null);
+        });
+        combinationActivityMapper.insert(dbCombinationActivity);
+        // 测试 name 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setName(null)));
+        // 测试 spuId 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSpuId(null)));
+        // 测试 totalLimitCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalLimitCount(null)));
+        // 测试 singleLimitCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSingleLimitCount(null)));
+        // 测试 startTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setStartTime(null)));
+        // 测试 endTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setEndTime(null)));
+        // 测试 userSize 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setUserSize(null)));
+        // 测试 totalNum 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalNum(null)));
+        // 测试 successNum 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessNum(null)));
+        // 测试 orderUserCount 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setOrderUserCount(null)));
+        // 测试 virtualGroup 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setVirtualGroup(null)));
+        // 测试 status 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setStatus(null)));
+        // 测试 limitDuration 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setLimitDuration(null)));
+        // 测试 createTime 不匹配
+        combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setCreateTime(null)));
+        // 准备参数
+        CombinationActivityExportReqVO reqVO = new CombinationActivityExportReqVO();
+        reqVO.setName(null);
+        reqVO.setSpuId(null);
+        reqVO.setTotalLimitCount(null);
+        reqVO.setSingleLimitCount(null);
+        reqVO.setStartTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setEndTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setUserSize(null);
+        reqVO.setTotalNum(null);
+        reqVO.setSuccessNum(null);
+        reqVO.setOrderUserCount(null);
+        reqVO.setVirtualGroup(null);
+        reqVO.setStatus(null);
+        reqVO.setLimitDuration(null);
+        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+        // 调用
+        List<CombinationActivityDO> list = combinationActivityService.getCombinationActivityList(reqVO);
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbCombinationActivity, list.get(0));
+    }
+
+}

yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java

@@ -115,7 +115,8 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
         when(productSpuApi.getSpuList(eq(asSet(11L, 21L)))).thenReturn(Arrays.asList(spu01, spu02));
         // mock 方法（用户收件地址的校验）
         AddressRespDTO addressRespDTO = new AddressRespDTO().setId(10L).setUserId(userId).setName("芋艿")
-                .setMobile("15601691300").setAreaId(3306).setPostCode("85757").setDetailAddress("土豆村");
+                //.setMobile("15601691300").setAreaId(3306).setPostCode("85757").setDetailAddress("土豆村");
+                .setMobile("15601691300").setAreaId(3306).setDetailAddress("土豆村");
         when(addressApi.getAddress(eq(10L), eq(userId))).thenReturn(addressRespDTO);
         // mock 方法（价格计算）
         PriceCalculateRespDTO.OrderItem priceOrderItem01 = new PriceCalculateRespDTO.OrderItem()
@@ -150,12 +151,12 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
         }))).thenReturn(1000L);
 
         // 调用方法
-        Long tradeOrderId = tradeOrderService.createOrder(userId, userIp, reqVO);
+        TradeOrderDO order = tradeOrderService.createOrder(userId, userIp, reqVO);
         // 断言 TradeOrderDO 订单
         List<TradeOrderDO> tradeOrderDOs = tradeOrderMapper.selectList();
         assertEquals(tradeOrderDOs.size(), 1);
         TradeOrderDO tradeOrderDO = tradeOrderDOs.get(0);
-        assertEquals(tradeOrderDO.getId(), tradeOrderId);
+        assertEquals(tradeOrderDO.getId(), order.getId());
         assertNotNull(tradeOrderDO.getNo());
         assertEquals(tradeOrderDO.getType(), TradeOrderTypeEnum.NORMAL.getType());
         assertEquals(tradeOrderDO.getTerminal(), TerminalEnum.H5.getTerminal());
@@ -195,7 +196,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
         TradeOrderItemDO tradeOrderItemDO01 = tradeOrderItemDOs.get(0);
         assertNotNull(tradeOrderItemDO01.getId());
         assertEquals(tradeOrderItemDO01.getUserId(), userId);
-        assertEquals(tradeOrderItemDO01.getOrderId(), tradeOrderId);
+        assertEquals(tradeOrderItemDO01.getOrderId(), order.getId());
         assertEquals(tradeOrderItemDO01.getSpuId(), 11L);
         assertEquals(tradeOrderItemDO01.getSkuId(), 1L);
         assertEquals(tradeOrderItemDO01.getProperties().size(), 1);
@@ -213,7 +214,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
         TradeOrderItemDO tradeOrderItemDO02 = tradeOrderItemDOs.get(1);
         assertNotNull(tradeOrderItemDO02.getId());
         assertEquals(tradeOrderItemDO02.getUserId(), userId);
-        assertEquals(tradeOrderItemDO02.getOrderId(), tradeOrderId);
+        assertEquals(tradeOrderItemDO02.getOrderId(), order.getId());
         assertEquals(tradeOrderItemDO02.getSpuId(), 21L);
         assertEquals(tradeOrderItemDO02.getSkuId(), 2L);
         assertEquals(tradeOrderItemDO02.getProperties().size(), 1);
@@ -239,7 +240,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
         verify(couponApi).useCoupon(argThat(reqDTO -> {
             assertEquals(reqDTO.getId(), reqVO.getCouponId());
             assertEquals(reqDTO.getUserId(), userId);
-            assertEquals(reqDTO.getOrderId(), tradeOrderId);
+            assertEquals(reqDTO.getOrderId(), order.getId());
             return true;
         }));
     }