guomengjiao 1 месяц назад
Родитель
Сommit
068f9aeef8
15 измененных файлов с 274 добавлено и 114 удалено
  1. 55 0
      ruoyi-shop/src/main/java/com/ruoyi/shop/enums/PriceType.java
  2. 65 0
      ruoyi-shop/src/main/java/com/ruoyi/shop/enums/Week.java
  3. 6 8
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivity.java
  4. 9 10
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivityProduct.java
  5. 14 17
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivityTimeItem.java
  6. 5 6
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityBo.java
  7. 10 35
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityProductBo.java
  8. 5 8
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityTimeItemBo.java
  9. 8 10
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityProductVo.java
  10. 3 3
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityTimeItemVo.java
  11. 10 14
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityVo.java
  12. 0 3
      ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/service/impl/SeckillActivityProductServiceImpl.java
  13. 29 0
      ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityMapper.xml
  14. 35 0
      ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityProductMapper.xml
  15. 20 0
      ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityTimeItemMapper.xml

+ 55 - 0
ruoyi-shop/src/main/java/com/ruoyi/shop/enums/PriceType.java

@@ -0,0 +1,55 @@
+package com.ruoyi.shop.enums;
+
+import com.ruoyi.common.enums.IIntegerEnum;
+
+import java.util.Objects;
+
+/**
+ * 活动 0固定折扣,1固定减价
+ * @author lubo
+ */
+public enum PriceType implements IIntegerEnum<Integer> {
+    FIXED_DISCOUNT(0, "固定折扣"),
+
+    PRICE_FIXED_BY(1, "固定减价"),
+
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    PriceType(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+
+    public static PriceType getByCode(int code, PriceType[] values) {
+        for (PriceType value : values) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static PriceType getByCode(int code) {
+        for (PriceType value : PriceType.values()) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

+ 65 - 0
ruoyi-shop/src/main/java/com/ruoyi/shop/enums/Week.java

@@ -0,0 +1,65 @@
+package com.ruoyi.shop.enums;
+
+import com.ruoyi.common.enums.IIntegerEnum;
+
+import java.util.Objects;
+
+/**
+ * 周几
+ * @author lubo
+ */
+public enum Week implements IIntegerEnum<Integer> {
+    SUNDAY(0, "周日"),
+
+    MONDAY(1, "周一"),
+
+    TUESDAY(2, "周二"),
+
+    WEDNESDAY(3, "周三"),
+
+    THURSDAY(4, "周四"),
+
+    FRIDAY(5, "周五"),
+
+    SATURDAY(6, "周六"),
+
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    Week(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+
+    public static Week getByCode(int code, Week[] values) {
+        for (Week value : values) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static Week getByCode(int code) {
+        for (Week value : Week.values()) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

+ 6 - 8
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivity.java

@@ -1,15 +1,13 @@
 package com.ruoyi.shop.marketing.seckill.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.shop.enums.CycleMode;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动对象 tb_seckill_activity
@@ -67,7 +65,7 @@ public class SeckillActivity extends BaseEntity {
     /**
      * 周期方式 0:每天 1:每周
      */
-    private Integer cycleMode;
+    private CycleMode cycleMode;
     /**
      * 周几(多个逗号拼接)
      */

+ 9 - 10
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivityProduct.java

@@ -1,14 +1,13 @@
 package com.ruoyi.shop.marketing.seckill.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.shop.enums.PriceType;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动商品对象 tb_seckill_activity_product
@@ -23,7 +22,7 @@ public class SeckillActivityProduct extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -42,7 +41,7 @@ public class SeckillActivityProduct extends BaseEntity {
     /**
      * 0固定折扣,1固定减价
      */
-    private Integer priceType;
+    private PriceType priceType;
     /**
      * 固定折扣、
      */
@@ -60,11 +59,11 @@ public class SeckillActivityProduct extends BaseEntity {
      */
     private Integer sort;
     /**
-     * 
+     *
      */
     private BigDecimal minPrice;
     /**
-     * 
+     *
      */
     private BigDecimal maxPrice;
     /**

+ 14 - 17
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/SeckillActivityTimeItem.java

@@ -1,15 +1,12 @@
 package com.ruoyi.shop.marketing.seckill.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.shop.enums.Week;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
+import java.io.Serializable;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动日期时间对象 tb_seckill_activity_time_item
@@ -19,12 +16,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @Data
 @TableName("tb_seckill_activity_time_item")
-public class SeckillActivityTimeItem extends BaseEntity {
+public class SeckillActivityTimeItem implements Serializable {
 
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -58,14 +55,14 @@ public class SeckillActivityTimeItem extends BaseEntity {
     private Date endTime;
     /**
      * 周几
-0:周日
-1:周一
-2:周二
-3:周三
-4:周四
-5:周五
-6:周六
+        0:周日
+        1:周一
+        2:周二
+        3:周三
+        4:周四
+        5:周五
+        6:周六
      */
-    private Integer week;
+    private Week week;
 
 }

+ 5 - 6
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityBo.java

@@ -1,19 +1,18 @@
 package com.ruoyi.shop.marketing.seckill.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
+import com.ruoyi.shop.enums.CycleMode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动业务对象 tb_seckill_activity
@@ -100,7 +99,7 @@ public class SeckillActivityBo extends BaseEntity {
      */
     @ApiModelProperty(value = "周期方式 0:每天 1:每周", required = true)
     @NotNull(message = "周期方式不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer cycleMode;
+    private CycleMode cycleMode;
 
     /**
      * 周几(多个逗号拼接)

+ 10 - 35
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityProductBo.java

@@ -1,17 +1,17 @@
 package com.ruoyi.shop.marketing.seckill.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.shop.enums.PriceType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动商品业务对象 tb_seckill_activity_product
@@ -25,17 +25,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class SeckillActivityProductBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 商家id
      */
     @ApiModelProperty(value = "商家id", required = true)
-    @NotNull(message = "商家id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
     /**
@@ -56,14 +54,13 @@ public class SeckillActivityProductBo extends BaseEntity {
      * 0固定折扣,1固定减价
      */
     @ApiModelProperty(value = "0固定折扣,1固定减价", required = true)
-    @NotNull(message = "0固定折扣,1固定减价不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer priceType;
+    @NotNull(message = "价格类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private PriceType priceType;
 
     /**
      * 固定折扣、
      */
     @ApiModelProperty(value = "固定折扣、", required = true)
-    @NotNull(message = "固定折扣、不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal discount;
 
     /**
@@ -84,18 +81,17 @@ public class SeckillActivityProductBo extends BaseEntity {
      * 商品排序,不填写,默认按后添加的在前
      */
     @ApiModelProperty(value = "商品排序,不填写,默认按后添加的在前", required = true)
-    @NotNull(message = "商品排序,不填写,默认按后添加的在前不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer sort;
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal minPrice;
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
@@ -112,30 +108,9 @@ public class SeckillActivityProductBo extends BaseEntity {
      * 初始化销量(假销量)
      */
     @ApiModelProperty(value = "初始化销量(假销量)", required = true)
-    @NotNull(message = "初始化销量(假销量)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "初始化销量不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer initSaleNum;
 
-    /**
-     * 真实销量
-     */
-    @ApiModelProperty(value = "真实销量", required = true)
-    @NotNull(message = "真实销量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer realSaleNum;
-
-    /**
-     * 输出销量(初始化销量+真实销量)
-     */
-    @ApiModelProperty(value = "输出销量(初始化销量+真实销量)", required = true)
-    @NotNull(message = "输出销量(初始化销量+真实销量)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer resultSaleNum;
-
-    /**
-     * 剩余库存(real_stock_total-result_sale_num)
-     */
-    @ApiModelProperty(value = "剩余库存(real_stock_total-result_sale_num)", required = true)
-    @NotNull(message = "剩余库存(real_stock_total-result_sale_num)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer residueStockTotal;
-
     /**
      * sku的所选项
      */

+ 5 - 8
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/bo/SeckillActivityTimeItemBo.java

@@ -1,18 +1,17 @@
 package com.ruoyi.shop.marketing.seckill.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.shop.enums.Week;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 秒杀活动日期时间业务对象 tb_seckill_activity_time_item
@@ -29,14 +28,12 @@ public class SeckillActivityTimeItemBo extends BaseEntity {
      *
      */
     @ApiModelProperty(value = "", required = true)
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 商家id
      */
     @ApiModelProperty(value = "商家id", required = true)
-    @NotNull(message = "商家id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
     /**
@@ -93,7 +90,7 @@ public class SeckillActivityTimeItemBo extends BaseEntity {
      */
     @ApiModelProperty(value = "周几 0:周日 1:周一 2:周二 3:周三 4:周四 5:周五 6:周六", required = true)
     @NotNull(message = "周几不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer week;
+    private Week week;
 
 
 }

+ 8 - 10
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityProductVo.java

@@ -1,14 +1,13 @@
 package com.ruoyi.shop.marketing.seckill.domain.vo;
 
-import java.math.BigDecimal;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.shop.enums.PriceType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
+
+import java.math.BigDecimal;
 
 
 /**
@@ -25,7 +24,7 @@ public class SeckillActivityProductVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")
@@ -57,7 +56,7 @@ public class SeckillActivityProductVo {
      */
     @ExcelProperty(value = "0固定折扣,1固定减价")
     @ApiModelProperty("0固定折扣,1固定减价")
-    private Integer priceType;
+    private PriceType priceType;
 
     /**
      * 固定折扣、
@@ -88,14 +87,14 @@ public class SeckillActivityProductVo {
     private Integer sort;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")
     private BigDecimal minPrice;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")
@@ -111,8 +110,7 @@ public class SeckillActivityProductVo {
     /**
      * 初始化销量(假销量)
      */
-    @ExcelProperty(value = "初始化销量", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "假=销量")
+    @ExcelProperty(value = "初始化销量")
     @ApiModelProperty("初始化销量(假销量)")
     private Integer initSaleNum;
 

+ 3 - 3
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityTimeItemVo.java

@@ -1,14 +1,14 @@
 package com.ruoyi.shop.marketing.seckill.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.shop.enums.Week;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -95,7 +95,7 @@ public class SeckillActivityTimeItemVo {
      */
     @ExcelProperty(value = "周几")
     @ApiModelProperty("周几 0:周日 1:周一 2:周二 3:周三 4:周四 5:周五 6:周六")
-    private Integer week;
+    private Week week;
 
 
 }

+ 10 - 14
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/domain/vo/SeckillActivityVo.java

@@ -1,14 +1,13 @@
 package com.ruoyi.shop.marketing.seckill.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+import com.ruoyi.shop.enums.CycleMode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -49,16 +48,14 @@ public class SeckillActivityVo {
     /**
      * 活动开始时间(小时)
      */
-    @ExcelProperty(value = "活动开始时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "小=时")
+    @ExcelProperty(value = "活动开始时间")
     @ApiModelProperty("活动开始时间(小时)")
     private String startHour;
 
     /**
      * 活动结束时间(小时)
      */
-    @ExcelProperty(value = "活动结束时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "小=时")
+    @ExcelProperty(value = "活动结束时间")
     @ApiModelProperty("活动结束时间(小时)")
     private String endHour;
 
@@ -79,6 +76,7 @@ public class SeckillActivityVo {
     /**
      * 活动图片
      */
+    @FilePathValue
     @ExcelProperty(value = "活动图片")
     @ApiModelProperty("活动图片")
     private String imgUrl;
@@ -95,7 +93,7 @@ public class SeckillActivityVo {
      */
     @ExcelProperty(value = "是否废弃")
     @ApiModelProperty("是否废弃")
-    private Integer discard;
+    private Boolean discard;
 
     /**
      * 周期方式
@@ -104,21 +102,19 @@ public class SeckillActivityVo {
      */
     @ExcelProperty(value = "周期方式")
     @ApiModelProperty("周期方式 0:每天 1:每周")
-    private Integer cycleMode;
+    private CycleMode cycleMode;
 
     /**
      * 周几(多个逗号拼接)
      */
-    @ExcelProperty(value = "周几", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "多=个逗号拼接")
+    @ExcelProperty(value = "周几")
     @ApiModelProperty("周几(多个逗号拼接)")
     private String weeks;
 
     /**
      * 订单自动关闭时间(商品按下单减库存,请设置未付款订单自动取消时间及时释放库存,可输入3-360分钟)
      */
-    @ExcelProperty(value = "订单自动关闭时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "商=品按下单减库存,请设置未付款订单自动取消时间及时释放库存,可输入3-360分钟")
+    @ExcelProperty(value = "订单自动关闭时间")
     @ApiModelProperty("订单自动关闭时间(商品按下单减库存,请设置未付款订单自动取消时间及时释放库存,可输入3-360分钟)")
     private Integer closeTime;
 

+ 0 - 3
ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/seckill/service/impl/SeckillActivityProductServiceImpl.java

@@ -75,9 +75,6 @@ public class SeckillActivityProductServiceImpl implements ISeckillActivityProduc
         lqw.eq(bo.getMaxPrice() != null, SeckillActivityProduct::getMaxPrice, bo.getMaxPrice());
         lqw.eq(bo.getRealStockTotal() != null, SeckillActivityProduct::getRealStockTotal, bo.getRealStockTotal());
         lqw.eq(bo.getInitSaleNum() != null, SeckillActivityProduct::getInitSaleNum, bo.getInitSaleNum());
-        lqw.eq(bo.getRealSaleNum() != null, SeckillActivityProduct::getRealSaleNum, bo.getRealSaleNum());
-        lqw.eq(bo.getResultSaleNum() != null, SeckillActivityProduct::getResultSaleNum, bo.getResultSaleNum());
-        lqw.eq(bo.getResidueStockTotal() != null, SeckillActivityProduct::getResidueStockTotal, bo.getResidueStockTotal());
         lqw.eq(StringUtils.isNotBlank(bo.getSkuTableValue()), SeckillActivityProduct::getSkuTableValue, bo.getSkuTableValue());
         lqw.eq(bo.getMinSalePrice() != null, SeckillActivityProduct::getMinSalePrice, bo.getMinSalePrice());
         lqw.eq(bo.getMaxSalePrice() != null, SeckillActivityProduct::getMaxSalePrice, bo.getMaxSalePrice());

+ 29 - 0
ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityMapper.xml

@@ -0,0 +1,29 @@
+<?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.ruoyi.shop.marketing.seckill.mapper.SeckillActivityMapper">
+
+    <resultMap type="com.ruoyi.shop.marketing.seckill.domain.SeckillActivity" id="SeckillActivityResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="name" column="name"/>
+        <result property="startHour" column="start_hour"/>
+        <result property="endHour" column="end_hour"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="explain" column="explain"/>
+        <result property="discard" column="discard"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="cycleMode" column="cycle_mode"/>
+        <result property="weeks" column="weeks"/>
+        <result property="closeTime" column="close_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+
+</mapper>

+ 35 - 0
ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityProductMapper.xml

@@ -0,0 +1,35 @@
+<?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.ruoyi.shop.marketing.seckill.mapper.SeckillActivityProductMapper">
+
+    <resultMap type="com.ruoyi.shop.marketing.seckill.domain.SeckillActivityProduct" id="SeckillActivityProductResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="productId" column="product_id"/>
+        <result property="seckillId" column="seckill_id"/>
+        <result property="priceType" column="price_type"/>
+        <result property="discount" column="discount"/>
+        <result property="fixPrice" column="fix_price"/>
+        <result property="limitBuyNum" column="limit_buy_num"/>
+        <result property="sort" column="sort"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="minPrice" column="min_price"/>
+        <result property="maxPrice" column="max_price"/>
+        <result property="realStockTotal" column="real_stock_total"/>
+        <result property="initSaleNum" column="init_sale_num"/>
+        <result property="realSaleNum" column="real_sale_num"/>
+        <result property="resultSaleNum" column="result_sale_num"/>
+        <result property="residueStockTotal" column="residue_stock_total"/>
+        <result property="skuTableValue" column="sku_table_value"/>
+        <result property="minSalePrice" column="min_sale_price"/>
+        <result property="maxSalePrice" column="max_sale_price"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+
+</mapper>

+ 20 - 0
ruoyi-shop/src/main/resources/mapper/marketing/seckill/SeckillActivityTimeItemMapper.xml

@@ -0,0 +1,20 @@
+<?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.ruoyi.shop.marketing.seckill.mapper.SeckillActivityTimeItemMapper">
+
+    <resultMap type="com.ruoyi.shop.marketing.seckill.domain.SeckillActivityTimeItem" id="SeckillActivityTimeItemResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="seckillId" column="seckill_id"/>
+        <result property="day" column="day"/>
+        <result property="startHour" column="start_hour"/>
+        <result property="endHour" column="end_hour"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="week" column="week"/>
+    </resultMap>
+
+
+</mapper>