feat：mall CombinationActivity

2025-08-14 10:11:53 +08:00 · 2023-07-03 08:07:05 +08:00
parent 6fc724545b
commit 409ec555e8
18 changed files with 1022 additions and 10 deletions
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
+++ b/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);
+    }
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityBaseVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityCreateReqVO.java
+++ b/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 {
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityExcelVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityExportReqVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityPageReqVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityRespVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/CombinationActivityUpdateReqVO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
+++ b/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);
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/combination/CombinationActivityDO.java
+++ b/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;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
+++ b/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));
+    }
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
+++ b/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);
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
+++ b/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);
+    }
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/seckillactivity/SeckillActivityServiceImpl.java
+++ b/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());