活动+拼单

mall-api/src/main/java/com/txz/mall/dto/StoreCombinationDTO.java

@@ -0,0 +1,212 @@
+/*
+ *
+ * StoreCombinationDTO.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2025-07-14
+ */
+package com.txz.mall.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class StoreCombinationDTO implements Serializable {
+    /**
+     * m_store_combination
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 拼团商品ID
+     */
+    private Long id;
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value = "商品id")
+    private Long productId;
+    /**
+     * 商户id
+     */
+    @ApiModelProperty(value = "商户id")
+    private Long merId;
+    /**
+     * 推荐图
+     */
+    @ApiModelProperty(value = "推荐图")
+    private String image;
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty(value = "轮播图")
+    private String images;
+    /**
+     * 活动标题
+     */
+    @ApiModelProperty(value = "活动标题")
+    private String title;
+    /**
+     * 活动属性
+     */
+    @ApiModelProperty(value = "活动属性")
+    private String attr;
+    /**
+     * 参团人数
+     */
+    @ApiModelProperty(value = "参团人数")
+    private Integer people;
+    /**
+     * 简介
+     */
+    @ApiModelProperty(value = "简介")
+    private String info;
+    /**
+     * 价格
+     */
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    /**
+     * 销量
+     */
+    @ApiModelProperty(value = "销量")
+    private Integer sales;
+    /**
+     * 库存
+     */
+    @ApiModelProperty(value = "库存")
+    private Integer stock;
+    /**
+     * 推荐
+     */
+    @ApiModelProperty(value = "推荐")
+    private Integer isHost;
+    /**
+     * 商品状态
+     */
+    @ApiModelProperty(value = "商品状态")
+    private Integer isShow;
+    /**
+     *
+     */
+    private Integer combination;
+    /**
+     * 商户是否可用 1可用 0不可用
+     */
+    @ApiModelProperty(value = "商户是否可用 1可用 0不可用")
+    private Integer merUse;
+    /**
+     * 是否包邮 1是 0否
+     */
+    @ApiModelProperty(value = "是否包邮 1是 0否")
+    private Integer isPostage;
+    /**
+     * 邮费
+     */
+    @ApiModelProperty(value = "邮费")
+    private BigDecimal postage;
+    /**
+     * 拼团开始时间
+     */
+    @ApiModelProperty(value = "拼团开始时间")
+    private Date startTime;
+    /**
+     * 拼团结束时间
+     */
+    @ApiModelProperty(value = "拼团结束时间")
+    private Date stopTime;
+    /**
+     * 拼团订单有效时间(小时)
+     */
+    @ApiModelProperty(value = "拼团订单有效时间(小时)")
+    private Integer effectiveTime;
+    /**
+     * 拼图商品成本
+     */
+    @ApiModelProperty(value = "拼图商品成本")
+    private BigDecimal cost;
+    /**
+     * 浏览量
+     */
+    @ApiModelProperty(value = "浏览量")
+    private Integer browse;
+    /**
+     * 单位名
+     */
+    @ApiModelProperty(value = "单位名")
+    private String unitName;
+    /**
+     * 运费模板ID
+     */
+    @ApiModelProperty(value = "运费模板ID")
+    private Long tempId;
+    /**
+     * 重量
+     */
+    @ApiModelProperty(value = "重量")
+    private BigDecimal weight;
+    /**
+     * 体积
+     */
+    @ApiModelProperty(value = "体积")
+    private BigDecimal volume;
+    /**
+     * 单次购买数量
+     */
+    @ApiModelProperty(value = "单次购买数量")
+    private Integer num;
+    /**
+     * 限购总数
+     */
+    @ApiModelProperty(value = "限购总数")
+    private Integer quota;
+    /**
+     * 限量总数显示
+     */
+    @ApiModelProperty(value = "限量总数显示")
+    private Integer quotaShow;
+    /**
+     * 原价
+     */
+    @ApiModelProperty(value = "原价")
+    private BigDecimal otPrice;
+    /**
+     * 每个订单可购买数量
+     */
+    @ApiModelProperty(value = "每个订单可购买数量")
+    private Integer onceNum;
+    /**
+     * 虚拟成团百分比
+     */
+    @ApiModelProperty(value = "虚拟成团百分比")
+    private Integer virtualRation;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人id
+     */
+    private Long createUserId;
+    /**
+     * 更新人id
+     */
+    private Long updateUserId;
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+
+
+}

mall-api/src/main/java/com/txz/mall/dto/StoreFlashActivityDTO.java

@@ -0,0 +1,92 @@
+/*
+ *
+ * StoreFlashActivityDTO.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2025-07-14
+ */
+package com.txz.mall.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class StoreFlashActivityDTO implements Serializable {
+    /**
+     * m_store_flash_activity
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     *
+     */
+    private Integer id;
+    /**
+     * 活动名称
+     */
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+    /**
+     * 活动类型 0=商品，1=拼团 ，2=秒杀
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=拼团 ，2=秒杀")
+    private Integer type;
+    /**
+     * 活动开始时间段
+     */
+    @ApiModelProperty(value = "活动开始时间段")
+    private Date startTime;
+    /**
+     * 活动结束时间段
+     */
+    @ApiModelProperty(value = "活动结束时间段")
+    private Date endTime;
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    /**
+     * 状态 0=关闭 1=开启
+     */
+    @ApiModelProperty(value = "状态 0=关闭 1=开启")
+    private Integer status;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人id
+     */
+    private Long createUserId;
+    /**
+     * 更新人id
+     */
+    private Long updateUserId;
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+    /**
+     * 主图
+     */
+    @ApiModelProperty(value = "主图")
+    private String img;
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty(value = "轮播图")
+    private String silderImgs;
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+
+}

mall-api/src/main/java/com/txz/mall/dto/StoreProductAttrResultDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,11 +25,13 @@ public class StoreProductAttrResultDTO implements Serializable {
     /**
      * 商品ID
      */
+    @ApiModelProperty(value = "商品ID")
     private Long productId;
     /**
      * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
      */
-    private Boolean type;
+    @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团")
+    private Integer type;
     /**
      * 创建时间
      */
@@ -48,10 +51,11 @@ public class StoreProductAttrResultDTO implements Serializable {
     /**
      * 是否删除
      */
-    private Byte isDelete;
+    private Integer isDelete;
     /**
      * 商品属性参数
      */
+    @ApiModelProperty(value = "商品属性参数")
     private String result;
 
 }

mall-api/src/main/java/com/txz/mall/dto/StoreProductDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,171 +21,209 @@ public class StoreProductDTO implements Serializable {
     private Long id;
 
     /**
-     * m_store_product
-     */
-    private static final long serialVersionUID = 1L;
-    /**
-     * 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)
+     * 商品图片(主图)
      */
-    private Integer merId;
+    @ApiModelProperty(value = "商品主图")
+    private String image;
 
     /**
      * 商品名称
      */
+    @ApiModelProperty(value = "商品名称")
     private String storeName;
 
     /**
      * 商品简介
      */
+    @ApiModelProperty(value = "商品简介")
     private String storeInfo;
+
     /**
-     * 商品图片(主图)
+     * 关键字（副标题）
      */
-    private String image;
+    @ApiModelProperty(value = "副标题")
+    private String keyword;
 
     /**
      * 分类id
      */
-    private String cateId;
+    @ApiModelProperty(value = "分类id")
+    private Long cateId;
 
     /**
      * 商品价格
      */
+    @ApiModelProperty(value = "商品价格")
     private BigDecimal price;
 
     /**
      * 会员价格
      */
+    @ApiModelProperty(value = "会员价格")
     private BigDecimal vipPrice;
 
     /**
      * 市场价
      */
+    @ApiModelProperty(value = "市场价")
     private BigDecimal otPrice;
 
     /**
      * 邮费
      */
+    @ApiModelProperty(value = "市场价")
     private BigDecimal postage;
 
     /**
      * 单位名
      */
+    @ApiModelProperty(value = "单位名")
     private String unitName;
+
     /**
-     * 关键字（副标题）
+     * 排序
      */
-    private String keyword;
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 
     /**
      * 销量
      */
+    @ApiModelProperty(value = "销量")
     private Integer sales;
 
     /**
      * 库存
      */
+    @ApiModelProperty(value = "库存")
     private Integer stock;
 
     /**
      * 状态（0：未上架，1：上架）
      */
+    @ApiModelProperty(value = "状态 （0：未上架，1：上架）")
     private Integer isShow;
 
     /**
      * 是否热卖
      */
+    @ApiModelProperty(value = "是否热卖")
     private Integer isHot;
 
     /**
      * 是否优惠
      */
+    @ApiModelProperty(value = "是否优惠")
     private Integer isBenefit;
 
     /**
      * 是否精品
      */
+    @ApiModelProperty(value = "是否精品")
     private Integer isBest;
 
     /**
      * 是否新品
      */
+    @ApiModelProperty(value = "是否新品")
     private Integer isNew;
 
     /**
      * 添加时间
      */
-    private Integer addTime;
-    /**
-     * 排序
-     */
-    private Integer sort;
+//    @Column(name = "add_time")
+//    private Integer addTime;
+
     /**
      * 是否包邮
      */
+    @ApiModelProperty(value = "是否包邮")
     private Integer isPostage;
 
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
     /**
      * 获得积分
      */
+    @ApiModelProperty(value = "获得积分")
     private Integer giveIntegral;
 
     /**
      * 成本价
      */
+    @ApiModelProperty(value = "成本价")
     private BigDecimal cost;
-    /**
-     * 是否删除
-     */
-    private Integer isDelete;
+
     /**
      * 秒杀状态 0 未开启 1已开启
      */
-    private Integer isSeckill;
+//    @Column(name = "is_seckill")
+//    @ApiModelProperty(value = "秒杀状态 0 未开启 1已开启")
+//    private Integer isSeckill;
+//
+//    /**
+//     * 砍价状态 0未开启 1开启
+//     */
+//    @Column(name = "is_bargain")
+//    @ApiModelProperty(value = "砍价状态  0未开启 1开启")
+//    private Integer isBargain;
 
     /**
      * 是否优品推荐
      */
+    @ApiModelProperty(value = "是否优品推荐")
     private Integer isGood;
 
     /**
      * 是否单独分佣
      */
+    @ApiModelProperty(value = "是否单独分佣")
     private Integer isSub;
 
     /**
      * 虚拟销量
      */
+    @ApiModelProperty(value = "虚拟销量")
     private Integer ficti;
 
     /**
      * 浏览量
      */
+    @ApiModelProperty(value = "浏览量")
     private Integer browse;
 
     /**
      * 主图视频链接
      */
+    @ApiModelProperty(value = "主图视频链接")
     private String videoLink;
 
     /**
      * 运费模板ID
      */
+    @ApiModelProperty("运费模板ID")
     private Integer tempId;
 
     /**
      * 规格 0单 1多
      */
+    @ApiModelProperty("规格 0单 1多")
     private Integer specType;
 
     /**
-     * 活动显示排序0=默认, 1=秒杀，2=砍价，3=拼团
+     * 活动显示排序 0=默认,1=拼团, 2=秒杀，
      */
+    @ApiModelProperty("活动显示排序0=默认,1=拼团, 2=秒杀，")
     private String activity;
 
     /**
      * 是否回收站
      */
+    @ApiModelProperty("是否回收站")
     private Integer isRecycle;
 
     /**
@@ -206,33 +245,40 @@ public class StoreProductDTO implements Serializable {
      * 更新时间
      */
     private Date updateTime;
-    /**
-     * 砍价状态 0未开启 1开启
-     */
-    private Integer isBargain;
+
     /**
      * 货号
      */
+    @ApiModelProperty("货号")
     private String itemNumber;
+
     /**
      * 品牌
      */
+    @ApiModelProperty("品牌")
     private String itemBrand;
+
     /**
      * 库存预警值
      */
+    @ApiModelProperty("库存预警值")
     private Integer stockThreshold;
+
     /**
      * 供应商
      */
+    @ApiModelProperty("供应商")
     private String itemSupplier;
+
     /**
      * 轮播图（白底图）
      */
+    @ApiModelProperty("轮播图（白底图）")
     private String sliderImage;
+
     /**
      * 展示图（详情图）
      */
+    @ApiModelProperty("展示图（详情图）")
     private String flatPattern;
-
 }

mall-api/src/main/java/com/txz/mall/dto/StoreProductRuleDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,6 +25,7 @@ public class StoreProductRuleDTO implements Serializable {
     /**
      * 规格名称
      */
+    @ApiModelProperty(value = "规格名称")
     private String ruleName;
     /**
      * 创建时间
@@ -48,6 +50,7 @@ public class StoreProductRuleDTO implements Serializable {
     /**
      * 规格值
      */
+    @ApiModelProperty(value = "规格值")
     private String ruleValue;
 
 

mall-api/src/main/java/com/txz/mall/dto/SystemDictDataDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,38 +21,45 @@ public class SystemDictDataDTO implements Serializable {
     /**
      * 字典编码
      */
+    @ApiModelProperty(value = "字典编码")
     private Long dictCode;
     /**
      * 字典排序
      */
+    @ApiModelProperty(value = "字典排序")
     private Integer dictSort;
     /**
      * 字典标签
      */
+    @ApiModelProperty(value = "字典标签")
     private String dictLabel;
     /**
      * 字典键值
      */
+    @ApiModelProperty(value = "字典键值")
     private String dictValue;
     /**
      * 字典类型
      */
+    @ApiModelProperty(value = "字典类型")
     private String dictType;
     /**
      * 样式属性（其他样式扩展）
      */
-    private String cssClass;
-    /**
-     * 表格回显样式
-     */
-    private String listClass;
+//    private String cssClass;
+//    /**
+//     * 表格回显样式
+//     */
+//    private String listClass;
     /**
      * 是否默认（Y是 N否）
      */
+    @ApiModelProperty(value = "是否默认")
     private String isDefault;
     /**
      * 状态（0正常 1停用）
      */
+    @ApiModelProperty(value = "状态")
     private Integer status;
     /**
      * 创建时间
@@ -76,6 +84,7 @@ public class SystemDictDataDTO implements Serializable {
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
 

mall-api/src/main/java/com/txz/mall/dto/SystemDictTypeDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,14 +25,17 @@ public class SystemDictTypeDTO implements Serializable {
     /**
      * 字典名称
      */
+    @ApiModelProperty(value = "字典名称")
     private String dictName;
     /**
      * 字典类型(唯一值)
      */
+    @ApiModelProperty(value = "字典类型")
     private String dictType;
     /**
      * 状态（0正常 1停用）
      */
+    @ApiModelProperty(value = "状态")
     private Integer status;
     /**
      * 创建时间
@@ -56,6 +60,7 @@ public class SystemDictTypeDTO implements Serializable {
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
 

mall-api/src/main/java/com/txz/mall/dto/SystemFormTempDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,11 +22,13 @@ public class SystemFormTempDTO implements Serializable {
     /**
      * 表单名称
      */
+    @ApiModelProperty(value = "表单名称")
     private String name;
 
     /**
      * 表单简介
      */
+    @ApiModelProperty(value = "表单简介")
     private String info;
 
     /**
@@ -56,6 +59,7 @@ public class SystemFormTempDTO implements Serializable {
     /**
      * 表单内容
      */
+    @ApiModelProperty(value = "表单内容")
     private String content;
     /**
      * 是否删除

mall-api/src/main/java/com/txz/mall/dto/SystemGroupDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,22 +25,27 @@ public class SystemGroupDTO implements Serializable {
     /**
      * 数据组名称
      */
+    @ApiModelProperty(value = "数据组名称")
     private String name;
     /**
      * 简介
      */
+    @ApiModelProperty(value = "简介")
     private String info;
     /**
      * form 表单 id
      */
+    @ApiModelProperty(value = "form 表单 id")
     private Integer formId;
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     /**
      * 创建人id

mall-api/src/main/java/com/txz/mall/dto/SystemGroupDataDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,18 +21,22 @@ public class SystemGroupDataDTO implements Serializable {
     /**
      * 组合数据详情ID
      */
+    @ApiModelProperty(value = "组合数据详情ID")
     private Long id;
     /**
      * 对应的数据组id
      */
+    @ApiModelProperty(value = "对应的数据组id")
     private Long gid;
     /**
      * 数据排序
      */
+    @ApiModelProperty(value = "数据排序")
     private Integer sort;
     /**
      * 状态（1：开启；0：关闭；）
      */
+    @ApiModelProperty(value = "状态（1：开启；0：关闭；）")
     private Integer status;
     /**
      * 创建时间
@@ -56,6 +61,7 @@ public class SystemGroupDataDTO implements Serializable {
     /**
      * 数据组对应的数据值（json数据）
      */
+    @ApiModelProperty(value = "数据组对应数据值")
     private String value;
 
 

mall-api/src/main/java/com/txz/mall/dto/UserSignDTO.java

@@ -6,6 +6,7 @@
  */
 package com.txz.mall.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,30 +25,37 @@ public class UserSignDTO implements Serializable {
     /**
      * 用户uid
      */
+    @ApiModelProperty(value = "用户uid")
     private Long uid;
     /**
      * 签到说明
      */
+    @ApiModelProperty(value = "签到说明")
     private String title;
     /**
      * 获得
      */
+    @ApiModelProperty(value = "获得")
     private Integer number;
     /**
      * 剩余
      */
+    @ApiModelProperty(value = "剩余")
     private Integer balance;
     /**
      * 类型，1积分，2经验  3金币
      */
+    @ApiModelProperty(value = "类型，1积分，2经验  3金币")
     private Boolean type;
     /**
      * 签到日期
      */
+    @ApiModelProperty(value = "签到日期")
     private Date createDay;
     /**
      * 添加时间
      */
+    @ApiModelProperty(value = "添加时间")
     private Date createTime;
 
 

mall-api/src/main/java/com/txz/mall/vo/FlashActivityVO.java

@@ -0,0 +1,27 @@
+package com.txz.mall.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 活动VO
+ * @Author: txz
+ * @Date: 2020/12/21 21:05
+ */
+@Data
+public class FlashActivityVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "成团人数")
+    private Integer groupNumber;
+
+    @ApiModelProperty(value = "倒计时时间 (单位：秒)")
+    private Integer countdownTime;
+
+    @ApiModelProperty(value = "库存")
+    private Integer inventory;
+
+}

mall-interface/src/main/java/com/txz/mall/service/StoreCombinationServiceClient.java

@@ -0,0 +1,27 @@
+package com.txz.mall.service;
+
+
+import com.txz.mall.dto.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+
+@FeignClient("mall")
+public interface StoreCombinationServiceClient {
+
+	@RequestMapping( value = {"/store/combination/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody StoreCombinationDPO storeCombination,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/combination/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/combination/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody StoreCombinationDPO storeCombination,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/combination/detail"}, method = {RequestMethod.POST} )
+	public Result<StoreCombinationDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/combination/list"}, method = {RequestMethod.POST} )
+	public Result<List<StoreCombinationDPO>> list(@RequestBody StoreCombinationDPO storeCombination, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-interface/src/main/java/com/txz/mall/service/StoreFlashActivityServiceClient.java

@@ -0,0 +1,27 @@
+package com.txz.mall.service;
+
+
+import com.txz.mall.dto.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+
+@FeignClient("mall")
+public interface StoreFlashActivityServiceClient {
+
+	@RequestMapping( value = {"/store/flash/activity/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody StoreFlashActivityDPO storeFlashActivity,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/flash/activity/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/flash/activity/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody StoreFlashActivityDPO storeFlashActivity,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/flash/activity/detail"}, method = {RequestMethod.POST} )
+	public Result<StoreFlashActivityDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/flash/activity/list"}, method = {RequestMethod.POST} )
+	public Result<List<StoreFlashActivityDPO>> list(@RequestBody StoreFlashActivityDPO storeFlashActivity, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-service/src/main/java/com/txz/mall/controller/StoreCombinationController.java

@@ -0,0 +1,156 @@
+package com.txz.mall.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.model.StoreCombination;
+import com.txz.mall.service.StoreCombinationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+@Api(tags = "[后台]拼团商品表管理")
+@RestController
+@RequestMapping("/store/combination")
+public class StoreCombinationController {
+
+    private static Logger log = LoggerFactory.getLogger(StoreCombinationController.class);
+
+    @Resource
+    private StoreCombinationService storeCombinationService;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "拼团商品表新增", httpMethod = "POST")
+    public Result add(@RequestBody StoreCombination storeCombination, Long userId) {
+        if (storeCombination == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            storeCombination.setCreateTime(new Date());
+            storeCombination.setCreateUserId(userId);
+            storeCombinationService.save(storeCombination);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation(value = "拼团商品表删除", httpMethod = "POST")
+    public Result delete(@RequestParam Long id, Long userId) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            StoreCombination storeCombination = new StoreCombination();
+            storeCombination.setId(id);
+            storeCombination.setIsDelete(1);
+            storeCombinationService.update(storeCombination);
+        } catch (Exception e) {
+            log.error("删除对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "拼团商品表更新", httpMethod = "POST")
+    public Result update(@RequestBody StoreCombination storeCombination, Long userId) {
+        if (storeCombination == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (storeCombination.getId() == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            storeCombination.setUpdateTime(new Date());
+            storeCombination.setUpdateUserId(userId);
+            storeCombinationService.update(storeCombination);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "拼团商品表获取详情", httpMethod = "POST")
+    public Result<StoreCombination> detail(@RequestParam Long id, Long userId) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        StoreCombination storeCombination = null;
+        try {
+            storeCombination = storeCombinationService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(storeCombination);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "拼团商品表获取列表", httpMethod = "POST")
+    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(storeCombination.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+        PageInfo pageInfo = null;
+        try {
+            List<StoreCombination> list = storeCombinationService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(pageInfo);
+    }
+
+    @PostMapping("/addActivityProduct")
+    @ApiOperation(value = "添加活动商品")
+    public Result addActivityProduct(@RequestBody List<StoreCombination> list, Long activityId) {
+        if (CollectionUtils.isEmpty(list)) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (activityId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            storeCombinationService.addActivityProduct(list, activityId);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+}

mall-service/src/main/java/com/txz/mall/controller/StoreFlashActivityController.java

@@ -0,0 +1,137 @@
+package com.txz.mall.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.model.StoreFlashActivity;
+import com.txz.mall.service.StoreFlashActivityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+@Api(tags = "[后台]限时活动管理")
+@RestController
+@RequestMapping("/store/flash/activity")
+public class StoreFlashActivityController {
+
+    private static Logger log = LoggerFactory.getLogger(StoreFlashActivityController.class);
+
+    @Resource
+    private StoreFlashActivityService storeFlashActivityService;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "限时活动新增")
+    public Result add(@RequestBody StoreFlashActivity storeFlashActivity, Long userId) {
+        if (storeFlashActivity == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            storeFlashActivity.setCreateTime(new Date());
+            storeFlashActivity.setCreateUserId(userId);
+            storeFlashActivityService.save(storeFlashActivity);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation(value = "限时活动删除", httpMethod = "POST")
+    public Result delete(@RequestParam Long id, Long userId) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            StoreFlashActivity storeFlashActivity = new StoreFlashActivity();
+            storeFlashActivity.setId(id);
+            storeFlashActivity.setIsDelete(1);
+            storeFlashActivityService.update(storeFlashActivity);
+        } catch (Exception e) {
+            log.error("删除对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "限时活动更新", httpMethod = "POST")
+    public Result update(@RequestBody StoreFlashActivity storeFlashActivity, Long userId) {
+        if (storeFlashActivity == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (storeFlashActivity.getId() == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        try {
+            storeFlashActivity.setUpdateTime(new Date());
+            storeFlashActivity.setUpdateUserId(userId);
+            storeFlashActivityService.update(storeFlashActivity);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "限时活动获取详情", httpMethod = "POST")
+    public Result<StoreFlashActivity> detail(@RequestParam Long id, Long userId) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        StoreFlashActivity storeFlashActivity = null;
+        try {
+            storeFlashActivity = storeFlashActivityService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(storeFlashActivity);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "限时活动获取列表", httpMethod = "POST")
+    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
+        if (userId == null) {
+            return Result.fail(ResultCode.USERID_IS_NULL);
+        }
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(storeFlashActivity.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+        PageInfo pageInfo = null;
+        try {
+            List<StoreFlashActivity> list = storeFlashActivityService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(pageInfo);
+    }
+}

mall-service/src/main/java/com/txz/mall/dao/StoreCombinationMapper.java

@@ -0,0 +1,7 @@
+package com.txz.mall.dao;
+
+import com.txz.mall.core.Mapper;
+import com.txz.mall.model.StoreCombination;
+
+public interface StoreCombinationMapper extends Mapper<StoreCombination> {
+}

mall-service/src/main/java/com/txz/mall/dao/StoreFlashActivityMapper.java

@@ -0,0 +1,7 @@
+package com.txz.mall.dao;
+
+import com.txz.mall.core.Mapper;
+import com.txz.mall.model.StoreFlashActivity;
+
+public interface StoreFlashActivityMapper extends Mapper<StoreFlashActivity> {
+}

mall-service/src/main/java/com/txz/mall/model/Category.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -15,36 +16,43 @@ public class Category {
     /**
      * 父级ID
      */
+    @ApiModelProperty(value = "父级ID")
     private Long pid;
 
     /**
      * 路径
      */
+    @ApiModelProperty(value = "路径")
     private String path;
 
     /**
      * 分类名称
      */
+    @ApiModelProperty(value = "分类名称")
     private String name;
 
     /**
      * 类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类，6 配置分类， 7 秒杀配置
      */
+    @ApiModelProperty(value = "类型，1 产品分类，2 附件分类，3 文章分类， 4 配置分类， 5 菜单分类，6 配置分类， 7 秒杀配置")
     private Integer type;
 
     /**
      * 地址
      */
+    @ApiModelProperty(value = "地址")
     private String url;
 
     /**
      * 状态, 1正常，0失效
      */
+    @ApiModelProperty(value = "状态, 1正常，0失效")
     private Integer status;
 
     /**
      * 排序
      */
+    @ApiModelProperty(value = "排序")
     private Integer sort;
 
     /**
@@ -63,6 +71,7 @@ public class Category {
      * 扩展字段 Jsos格式
      */
     @Column(name = "extra")
+    @ApiModelProperty(value = "扩展字段 Jsos格式")
     private String extra;
 
     /**

mall-service/src/main/java/com/txz/mall/model/StoreCombination.java

@@ -0,0 +1,262 @@
+package com.txz.mall.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Table(name = "m_store_combination")
+public class StoreCombination {
+    /**
+     * 拼团商品ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    @Column(name = "product_id")
+    @ApiModelProperty(value = "商品id")
+    private Long productId;
+
+    /**
+     * 商户id
+     */
+//    @Column(name = "mer_id")
+//    private Long merId;
+
+    /**
+     * 推荐图
+     */
+    @ApiModelProperty(value = "推荐图")
+    private String image;
+
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty(value = "轮播图")
+    private String images;
+
+    /**
+     * 活动标题
+     */
+    @ApiModelProperty(value = "活动标题")
+    private String title;
+
+    /**
+     * 活动属性
+     */
+    @ApiModelProperty(value = "活动属性")
+    private String attr;
+
+    /**
+     * 参团人数
+     */
+    @ApiModelProperty(value = "参团人数")
+    private Integer people;
+
+    /**
+     * 简介
+     */
+    @ApiModelProperty(value = "简介")
+    private String info;
+
+    /**
+     * 价格
+     */
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 销量
+     */
+    @ApiModelProperty(value = "销量")
+    private Integer sales;
+
+    /**
+     * 库存
+     */
+    @ApiModelProperty(value = "库存")
+    private Integer stock;
+
+    /**
+     * 推荐
+     */
+    @Column(name = "is_host")
+    @ApiModelProperty(value = "推荐")
+    private Integer isHost;
+
+    /**
+     * 商品状态
+     */
+    @Column(name = "is_show")
+    @ApiModelProperty(value = "商品状态")
+    private Integer isShow;
+
+    /**
+     * 拼团
+     */
+    private Integer combination;
+
+    /**
+     * 商户是否可用 1可用 0不可用
+     */
+    @Column(name = "mer_use")
+    @ApiModelProperty(value = "商户是否可用 1可用 0不可用")
+    private Integer merUse;
+
+    /**
+     * 是否包邮 1是 0否
+     */
+    @Column(name = "is_postage")
+    @ApiModelProperty(value = "是否包邮 1是 0否")
+    private Integer isPostage;
+
+    /**
+     * 邮费
+     */
+    @ApiModelProperty(value = "邮费")
+    private BigDecimal postage;
+
+    /**
+     * 拼团开始时间
+     */
+    @Column(name = "start_time")
+    @ApiModelProperty(value = "拼团开始时间")
+    private Date startTime;
+
+    /**
+     * 拼团结束时间
+     */
+    @Column(name = "stop_time")
+    @ApiModelProperty(value = "拼团结束时间")
+    private Date stopTime;
+
+    /**
+     * 拼团订单有效时间(小时)
+     */
+    @Column(name = "effective_time")
+    @ApiModelProperty(value = "拼团订单有效时间(小时)")
+    private Integer effectiveTime;
+
+    /**
+     * 拼图商品成本
+     */
+    @ApiModelProperty(value = "拼图商品成本")
+    private BigDecimal cost;
+
+    /**
+     * 浏览量
+     */
+    @ApiModelProperty(value = "浏览量")
+    private Integer browse;
+
+    /**
+     * 单位名
+     */
+    @Column(name = "unit_name")
+    @ApiModelProperty(value = "单位名")
+    private String unitName;
+
+    /**
+     * 运费模板ID
+     */
+    @Column(name = "temp_id")
+    @ApiModelProperty(value = "运费模板ID")
+    private Long tempId;
+
+    /**
+     * 重量
+     */
+    @ApiModelProperty(value = "重量")
+    private BigDecimal weight;
+
+    /**
+     * 体积
+     */
+    @ApiModelProperty(value = "体积")
+    private BigDecimal volume;
+
+    /**
+     * 单次购买数量
+     */
+    @ApiModelProperty(value = "单次购买数量")
+    private Integer num;
+
+    /**
+     * 限购总数
+     */
+    @ApiModelProperty(value = "限购总数")
+    private Integer quota;
+
+    /**
+     * 限量总数显示
+     */
+    @Column(name = "quota_show")
+    @ApiModelProperty(value = "限量总数显示")
+    private Integer quotaShow;
+
+    /**
+     * 原价
+     */
+    @Column(name = "ot_price")
+    @ApiModelProperty(value = "原价")
+    private BigDecimal otPrice;
+
+    /**
+     * 每个订单可购买数量
+     */
+    @Column(name = "once_num")
+    @ApiModelProperty(value = "每个订单可购买数量")
+    private Integer onceNum;
+
+    /**
+     * 虚拟成团百分比
+     */
+    @Column(name = "virtual_ration")
+    @ApiModelProperty(value = "虚拟成团百分比")
+    private Integer virtualRation;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private Integer isDelete;
+
+
+}

mall-service/src/main/java/com/txz/mall/model/StoreFlashActivity.java

@@ -0,0 +1,104 @@
+package com.txz.mall.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@Table(name = "m_store_flash_activity")
+public class StoreFlashActivity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 活动名称
+     */
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+
+    /**
+     * 活动类型 0=商品，1=拼团 ，2=秒杀
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=拼团 ，2=秒杀")
+    private Integer type;
+
+    /**
+     * 活动开始时间段
+     */
+    @Column(name = "start_time")
+    @ApiModelProperty(value = "活动开始时间段")
+    private Date startTime;
+
+    /**
+     * 活动结束时间段
+     */
+    @Column(name = "end_time")
+    @ApiModelProperty(value = "活动结束时间段")
+    private Date endTime;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 状态 0=关闭 1=开启
+     */
+    @ApiModelProperty(value = "状态 0=关闭 1=开启")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private Integer isDelete;
+
+    /**
+     * 主图
+     */
+    @ApiModelProperty(value = "主图")
+    private String img;
+
+    /**
+     * 轮播图
+     */
+    @Column(name = "silder_imgs")
+    @ApiModelProperty(value = "轮播图")
+    private String silderImgs;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+
+}

mall-service/src/main/java/com/txz/mall/model/StoreProduct.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -19,199 +20,233 @@ public class StoreProduct {
     /**
      * 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)
      */
-    @Column(name = "mer_id")
-    private Integer merId;
+//    @Column(name = "mer_id")
+//    @ApiModelProperty("商户Id")
+//    private Integer merId;
 
     /**
      * 商品图片(主图)
      */
+    @ApiModelProperty(value = "商品主图")
     private String image;
 
     /**
      * 商品名称
      */
     @Column(name = "store_name")
+    @ApiModelProperty(value = "商品名称")
     private String storeName;
 
     /**
      * 商品简介
      */
     @Column(name = "store_info")
+    @ApiModelProperty(value = "商品简介")
     private String storeInfo;
 
     /**
      * 关键字（副标题）
      */
+    @ApiModelProperty(value = "副标题")
     private String keyword;
 
     /**
      * 分类id
      */
     @Column(name = "cate_id")
+    @ApiModelProperty(value = "分类id")
     private Long cateId;
 
     /**
      * 商品价格
      */
+    @ApiModelProperty(value = "商品价格")
     private BigDecimal price;
 
     /**
      * 会员价格
      */
     @Column(name = "vip_price")
+    @ApiModelProperty(value = "会员价格")
     private BigDecimal vipPrice;
 
     /**
      * 市场价
      */
     @Column(name = "ot_price")
+    @ApiModelProperty(value = "市场价")
     private BigDecimal otPrice;
 
     /**
      * 邮费
      */
+    @ApiModelProperty(value = "市场价")
     private BigDecimal postage;
 
     /**
      * 单位名
      */
     @Column(name = "unit_name")
+    @ApiModelProperty(value = "单位名")
     private String unitName;
 
     /**
      * 排序
      */
+    @ApiModelProperty(value = "排序")
     private Integer sort;
 
     /**
      * 销量
      */
+    @ApiModelProperty(value = "销量")
     private Integer sales;
 
     /**
      * 库存
      */
+    @ApiModelProperty(value = "库存")
     private Integer stock;
 
     /**
      * 状态（0：未上架，1：上架）
      */
     @Column(name = "is_show")
+    @ApiModelProperty(value = "状态 （0：未上架，1：上架）")
     private Integer isShow;
 
     /**
      * 是否热卖
      */
     @Column(name = "is_hot")
+    @ApiModelProperty(value = "是否热卖")
     private Integer isHot;
 
     /**
      * 是否优惠
      */
     @Column(name = "is_benefit")
+    @ApiModelProperty(value = "是否优惠")
     private Integer isBenefit;
 
     /**
      * 是否精品
      */
     @Column(name = "is_best")
+    @ApiModelProperty(value = "是否精品")
     private Integer isBest;
 
     /**
      * 是否新品
      */
     @Column(name = "is_new")
+    @ApiModelProperty(value = "是否新品")
     private Integer isNew;
 
     /**
      * 添加时间
      */
-    @Column(name = "add_time")
-    private Integer addTime;
+//    @Column(name = "add_time")
+//    private Integer addTime;
 
     /**
      * 是否包邮
      */
     @Column(name = "is_postage")
+    @ApiModelProperty(value = "是否包邮")
     private Integer isPostage;
 
     /**
      * 是否删除
      */
     @Column(name = "is_delete")
+    @ApiModelProperty(value = "是否删除")
     private Integer isDelete;
 
     /**
      * 获得积分
      */
     @Column(name = "give_integral")
+    @ApiModelProperty(value = "获得积分")
     private Integer giveIntegral;
 
     /**
      * 成本价
      */
+    @ApiModelProperty(value = "成本价")
     private BigDecimal cost;
 
     /**
      * 秒杀状态 0 未开启 1已开启
      */
-    @Column(name = "is_seckill")
-    private Integer isSeckill;
-
-    /**
-     * 砍价状态 0未开启 1开启
-     */
-    @Column(name = "is_bargain")
-    private Integer isBargain;
+//    @Column(name = "is_seckill")
+//    @ApiModelProperty(value = "秒杀状态 0 未开启 1已开启")
+//    private Integer isSeckill;
+//
+//    /**
+//     * 砍价状态 0未开启 1开启
+//     */
+//    @Column(name = "is_bargain")
+//    @ApiModelProperty(value = "砍价状态  0未开启 1开启")
+//    private Integer isBargain;
 
     /**
      * 是否优品推荐
      */
     @Column(name = "is_good")
+    @ApiModelProperty(value = "是否优品推荐")
     private Integer isGood;
 
     /**
      * 是否单独分佣
      */
     @Column(name = "is_sub")
+    @ApiModelProperty(value = "是否单独分佣")
     private Integer isSub;
 
     /**
      * 虚拟销量
      */
+    @ApiModelProperty(value = "虚拟销量")
     private Integer ficti;
 
     /**
      * 浏览量
      */
+    @ApiModelProperty(value = "浏览量")
     private Integer browse;
 
     /**
      * 主图视频链接
      */
     @Column(name = "video_link")
+    @ApiModelProperty(value = "主图视频链接")
     private String videoLink;
 
     /**
      * 运费模板ID
      */
     @Column(name = "temp_id")
+    @ApiModelProperty("运费模板ID")
     private Integer tempId;
 
     /**
      * 规格 0单 1多
      */
     @Column(name = "spec_type")
+    @ApiModelProperty("规格 0单 1多")
     private Integer specType;
 
     /**
-     * 活动显示排序0=默认, 1=秒杀，2=砍价，3=拼团
+     * 活动显示排序 0=默认,1=拼团, 2=秒杀，
      */
+    @ApiModelProperty("活动显示排序0=默认,1=拼团, 2=秒杀，")
     private String activity;
 
     /**
      * 是否回收站
      */
+    @ApiModelProperty("是否回收站")
     @Column(name = "is_recycle")
     private Integer isRecycle;
 
@@ -243,36 +278,42 @@ public class StoreProduct {
      * 货号
      */
     @Column(name = "item_number")
+    @ApiModelProperty("货号")
     private String itemNumber;
 
     /**
      * 品牌
      */
     @Column(name = "item_brand")
+    @ApiModelProperty("品牌")
     private String itemBrand;
 
     /**
      * 库存预警值
      */
     @Column(name = "stock_threshold")
+    @ApiModelProperty("库存预警值")
     private Integer stockThreshold;
 
     /**
      * 供应商
      */
     @Column(name = "item_supplier")
+    @ApiModelProperty("供应商")
     private String itemSupplier;
 
     /**
      * 轮播图（白底图）
      */
     @Column(name = "slider_image")
+    @ApiModelProperty("轮播图（白底图）")
     private String sliderImage;
 
     /**
      * 展示图（详情图）
      */
     @Column(name = "flat_pattern")
+    @ApiModelProperty("展示图（详情图）")
     private String flatPattern;
 
 }

mall-service/src/main/java/com/txz/mall/model/StoreProductAttrResult.java

@@ -1,6 +1,7 @@
 package com.txz.mall.model;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -19,12 +20,14 @@ public class StoreProductAttrResult {
     /**
      * 商品ID
      */
+    @ApiModelProperty(value = "商品ID")
     @Column(name = "product_id")
     private Long productId;
 
     /**
-     * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+     * 活动类型 0=商品，1=拼团，2=秒杀
      */
+    @ApiModelProperty(value = "活动类型 0=商品，1=拼团，2=秒杀")
     private Integer type;
 
     /**
@@ -61,6 +64,7 @@ public class StoreProductAttrResult {
     /**
      * 商品属性参数
      */
+    @ApiModelProperty(value = "商品属性参数")
     private String result;
 
 

mall-service/src/main/java/com/txz/mall/model/StoreProductRule.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -15,6 +16,7 @@ public class StoreProductRule {
     /**
      * 规格名称
      */
+    @ApiModelProperty(value = "规格名称")
     @Column(name = "rule_name")
     private String ruleName;
 
@@ -51,6 +53,7 @@ public class StoreProductRule {
     /**
      * 规格值
      */
+    @ApiModelProperty(value = "规格值")
     @Column(name = "rule_value")
     private String ruleValue;
 

mall-service/src/main/java/com/txz/mall/model/SystemDictData.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -20,6 +21,7 @@ public class SystemDictData {
     /**
      * 字典排序
      */
+    @ApiModelProperty(value = "字典排序")
     @Column(name = "dict_sort")
     private Integer dictSort;
 
@@ -27,41 +29,46 @@ public class SystemDictData {
      * 字典标签
      */
     @Column(name = "dict_label")
+    @ApiModelProperty(value = "字典标签")
     private String dictLabel;
 
     /**
      * 字典键值
      */
     @Column(name = "dict_value")
+    @ApiModelProperty(value = "字典键值")
     private String dictValue;
 
     /**
      * 字典类型
      */
     @Column(name = "dict_type")
+    @ApiModelProperty(value = "字典类型")
     private String dictType;
 
     /**
      * 样式属性（其他样式扩展）
      */
-    @Column(name = "css_class")
-    private String cssClass;
-
-    /**
-     * 表格回显样式
-     */
-    @Column(name = "list_class")
-    private String listClass;
+//    @Column(name = "css_class")
+//    private String cssClass;
+//
+//    /**
+//     * 表格回显样式
+//     */
+//    @Column(name = "list_class")
+//    private String listClass;
 
     /**
      * 是否默认（Y是 N否）
      */
     @Column(name = "is_default")
+    @ApiModelProperty(value = "是否默认（Y是 N否）")
     private String isDefault;
 
     /**
      * 状态（0正常 1停用）
      */
+    @ApiModelProperty(value = " 状态（0正常 1停用）")
     private Integer status;
 
     /**
@@ -97,6 +104,7 @@ public class SystemDictData {
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
 

mall-service/src/main/java/com/txz/mall/model/SystemDictType.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -20,18 +21,21 @@ public class SystemDictType {
     /**
      * 字典名称
      */
+    @ApiModelProperty(value = "字典名称")
     @Column(name = "dict_name")
     private String dictName;
 
     /**
      * 字典类型(唯一值)
      */
+    @ApiModelProperty(value = "字典类型")
     @Column(name = "dict_type")
     private String dictType;
 
     /**
      * 状态（0正常 1停用）
      */
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
     /**
@@ -67,6 +71,7 @@ public class SystemDictType {
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
 

mall-service/src/main/java/com/txz/mall/model/SystemFormTemp.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -18,11 +19,13 @@ public class SystemFormTemp {
     /**
      * 表单名称
      */
+    @ApiModelProperty(value = "表单名称")
     private String name;
 
     /**
      * 表单简介
      */
+    @ApiModelProperty(value = "表单简介")
     private String info;
 
     /**
@@ -58,6 +61,7 @@ public class SystemFormTemp {
     /**
      * 表单内容
      */
+    @ApiModelProperty(value = "表单内容")
     private String content;
 
 }

mall-service/src/main/java/com/txz/mall/model/SystemGroup.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -18,17 +19,20 @@ public class SystemGroup {
     /**
      * 数据组名称
      */
+    @ApiModelProperty(value = "数据组名称")
     private String name;
 
     /**
      * 简介
      */
+    @ApiModelProperty(value = "简介")
     private String info;
 
     /**
      * form 表单 id
      */
     @Column(name = "form_id")
+    @ApiModelProperty(value = "form 表单 id")
     private Integer formId;
 
     /**

mall-service/src/main/java/com/txz/mall/model/SystemGroupData.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -18,16 +19,19 @@ public class SystemGroupData {
     /**
      * 对应的数据组id
      */
+    @ApiModelProperty(value = "对应的数据组id")
     private Long gid;
 
     /**
      * 数据排序
      */
+    @ApiModelProperty(value = "数据排序")
     private Integer sort;
 
     /**
      * 状态（1：开启；0：关闭；）
      */
+    @ApiModelProperty(value = "状态（1：开启；0：关闭；）")
     private Integer status;
 
     /**
@@ -63,6 +67,7 @@ public class SystemGroupData {
     /**
      * 数据组对应的数据值（json数据）
      */
+    @ApiModelProperty(value = "数据组对应的数据值（json数据）")
     private String value;
 
 }

mall-service/src/main/java/com/txz/mall/model/UserSign.java

@@ -1,5 +1,6 @@
 package com.txz.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -15,43 +16,51 @@ public class UserSign {
     /**
      * 用户uid
      */
+    @ApiModelProperty(value = "用户uid")
     private Long uid;
 
     /**
      * 签到说明
      */
+    @ApiModelProperty(value = "签到说明")
     private String title;
 
     /**
      * 获得
      */
+    @ApiModelProperty(value = "获得")
     private Integer number;
 
     /**
      * 剩余
      */
+    @ApiModelProperty(value = "剩余")
     private Integer balance;
 
     /**
      * 类型，1积分，2经验  3金币
      */
+    @ApiModelProperty(value = "类型，1积分，2经验  3金币")
     private Integer type;
 
     /**
      * 签到日期
      */
+    @ApiModelProperty(value = "签到日期")
     @Column(name = "create_day")
     private Date createDay;
 
     /**
      * 添加时间
      */
+    @ApiModelProperty(value = "添加时间")
     @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 连续签到天数
      */
+    @ApiModelProperty(value = "连续签到天数")
     @Column(name = "continuous_days")
     private Integer continuousDays;
 

mall-service/src/main/java/com/txz/mall/service/StoreCombinationService.java

@@ -0,0 +1,21 @@
+package com.txz.mall.service;
+
+import com.txz.mall.core.Service;
+import com.txz.mall.model.StoreCombination;
+
+import java.util.List;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+public interface StoreCombinationService extends Service<StoreCombination> {
+
+    /**
+     * 添加活动商品
+     *
+     * @param list
+     * @param activityId
+     */
+    void addActivityProduct(List<StoreCombination> list, Long activityId);
+}

mall-service/src/main/java/com/txz/mall/service/StoreFlashActivityService.java

@@ -0,0 +1,12 @@
+package com.txz.mall.service;
+
+import com.txz.mall.core.Service;
+import com.txz.mall.model.StoreFlashActivity;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+public interface StoreFlashActivityService extends Service<StoreFlashActivity> {
+
+}

mall-service/src/main/java/com/txz/mall/service/impl/StoreCombinationServiceImpl.java

@@ -0,0 +1,37 @@
+package com.txz.mall.service.impl;
+
+import com.txz.mall.core.AbstractService;
+import com.txz.mall.core.ServiceException;
+import com.txz.mall.dao.StoreCombinationMapper;
+import com.txz.mall.model.StoreCombination;
+import com.txz.mall.model.StoreFlashActivity;
+import com.txz.mall.service.StoreCombinationService;
+import com.txz.mall.service.StoreFlashActivityService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+@Service
+@Transactional
+public class StoreCombinationServiceImpl extends AbstractService<StoreCombination> implements StoreCombinationService {
+    @Resource
+    private StoreCombinationMapper storeCombinationMapper;
+
+    @Resource
+    private StoreFlashActivityService storeFlashActivityService;
+
+    @Override
+    public void addActivityProduct(List<StoreCombination> list, Long activityId) {
+        StoreFlashActivity flashActivity = storeFlashActivityService.findById(activityId);
+        if (flashActivity == null) {
+            throw new ServiceException("找不到对应的活动");
+        }
+        save(list);
+    }
+}

mall-service/src/main/java/com/txz/mall/service/impl/StoreFlashActivityServiceImpl.java

@@ -0,0 +1,22 @@
+package com.txz.mall.service.impl;
+
+import com.txz.mall.core.AbstractService;
+import com.txz.mall.dao.StoreFlashActivityMapper;
+import com.txz.mall.model.StoreFlashActivity;
+import com.txz.mall.service.StoreFlashActivityService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/14.
+ */
+@Service
+@Transactional
+public class StoreFlashActivityServiceImpl extends AbstractService<StoreFlashActivity> implements StoreFlashActivityService {
+    @Resource
+    private StoreFlashActivityMapper mStoreFlashActivityMapper;
+
+}

mall-service/src/main/resources/mapper/StoreCombinationMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.txz.mall.dao.StoreCombinationMapper">
+    <resultMap id="BaseResultMap" type="com.txz.mall.model.StoreCombination">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="product_id" jdbcType="BIGINT" property="productId"/>
+        <result column="mer_id" jdbcType="BIGINT" property="merId"/>
+        <result column="image" jdbcType="VARCHAR" property="image"/>
+        <result column="images" jdbcType="VARCHAR" property="images"/>
+        <result column="title" jdbcType="VARCHAR" property="title"/>
+        <result column="attr" jdbcType="VARCHAR" property="attr"/>
+        <result column="people" jdbcType="INTEGER" property="people"/>
+        <result column="info" jdbcType="VARCHAR" property="info"/>
+        <result column="price" jdbcType="DECIMAL" property="price"/>
+        <result column="sort" jdbcType="INTEGER" property="sort"/>
+        <result column="sales" jdbcType="INTEGER" property="sales"/>
+        <result column="stock" jdbcType="INTEGER" property="stock"/>
+        <result column="is_host" jdbcType="INTEGER" property="isHost"/>
+        <result column="is_show" jdbcType="INTEGER" property="isShow"/>
+        <result column="combination" jdbcType="INTEGER" property="combination"/>
+        <result column="mer_use" jdbcType="INTEGER" property="merUse"/>
+        <result column="is_postage" jdbcType="INTEGER" property="isPostage"/>
+        <result column="postage" jdbcType="DECIMAL" property="postage"/>
+        <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
+        <result column="stop_time" jdbcType="TIMESTAMP" property="stopTime"/>
+        <result column="effective_time" jdbcType="INTEGER" property="effectiveTime"/>
+        <result column="cost" jdbcType="DECIMAL" property="cost"/>
+        <result column="browse" jdbcType="INTEGER" property="browse"/>
+        <result column="unit_name" jdbcType="VARCHAR" property="unitName"/>
+        <result column="temp_id" jdbcType="BIGINT" property="tempId"/>
+        <result column="weight" jdbcType="DECIMAL" property="weight"/>
+        <result column="volume" jdbcType="DECIMAL" property="volume"/>
+        <result column="num" jdbcType="INTEGER" property="num"/>
+        <result column="quota" jdbcType="INTEGER" property="quota"/>
+        <result column="quota_show" jdbcType="INTEGER" property="quotaShow"/>
+        <result column="ot_price" jdbcType="DECIMAL" property="otPrice"/>
+        <result column="once_num" jdbcType="INTEGER" property="onceNum"/>
+        <result column="virtual_ration" jdbcType="INTEGER" property="virtualRation"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="is_delete" jdbcType="INTEGER" property="isDelete"/>
+    </resultMap>
+</mapper>

mall-service/src/main/resources/mapper/StoreFlashActivityMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.txz.mall.dao.StoreFlashActivityMapper">
+    <resultMap id="BaseResultMap" type="com.txz.mall.model.StoreFlashActivity">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="type" jdbcType="INTEGER" property="type"/>
+        <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
+        <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
+        <result column="sort" jdbcType="INTEGER" property="sort"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="is_delete" jdbcType="TINYINT" property="isDelete"/>
+        <result column="img" jdbcType="VARCHAR" property="img"/>
+        <result column="silder_imgs" jdbcType="VARCHAR" property="silderImgs"/>
+        <result column="content" jdbcType="VARCHAR" property="content"/>
+    </resultMap>
+</mapper>