广告和活动配置CRUD

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityAdvertisingController.java

@@ -0,0 +1,109 @@
+package com.zhongzheng.controller.activity;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
+import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 广告发布储存Controller
+ * 
+ * @author change
+ * @date 2021-05-17
+ */
+@Api(value = "广告发布储存控制器", tags = {"广告发布储存管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/advertising")
+public class ActivityAdvertisingController extends BaseController {
+
+    private final IActivityAdvertisingService iActivityAdvertisingService;
+
+    /**
+     * 查询广告发布储存列表
+     */
+    @ApiOperation("查询广告发布储存列表")
+    @PreAuthorize("@ss.hasPermi('system:advertising:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityAdvertisingVo> list(ActivityAdvertisingQueryBo bo) {
+        startPage();
+        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出广告发布储存列表
+     */
+  /*  @ApiOperation("导出广告发布储存列表")
+    @PreAuthorize("@ss.hasPermi('system:advertising:export')")
+    @Log(title = "广告发布储存", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityAdvertisingVo> export(ActivityAdvertisingQueryBo bo) {
+        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
+        ExcelUtil<ActivityAdvertisingVo> util = new ExcelUtil<ActivityAdvertisingVo>(ActivityAdvertisingVo.class);
+        return util.exportExcel(list, "广告发布储存");
+    }*/
+
+    /**
+     * 获取广告发布储存详细信息
+     */
+    @ApiOperation("获取广告发布储存详细信息")
+    @PreAuthorize("@ss.hasPermi('system:advertising:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ActivityAdvertisingVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iActivityAdvertisingService.queryById(id));
+    }
+
+    /**
+     * 新增广告发布储存
+     */
+    @ApiOperation("新增广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:add')")
+    @Log(title = "广告发布储存", businessType = BusinessType.INSERT)
+    @PostMapping("addActivity")
+    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingAddBo bo) {
+        return toAjax(iActivityAdvertisingService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改广告发布储存
+     */
+    @ApiOperation("修改广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:edit')")
+    @Log(title = "广告发布储存", businessType = BusinessType.UPDATE)
+    @PostMapping("updateActivity")
+    public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingEditBo bo) {
+        return toAjax(iActivityAdvertisingService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除广告发布储存
+     */
+    @ApiOperation("删除广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:remove')")
+    @Log(title = "广告发布储存" , businessType = BusinessType.DELETE)
+    @PostMapping("deleteActivity")
+    public AjaxResult<Void> remove(@RequestBody Long[] ids) {
+        return toAjax(iActivityAdvertisingService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -0,0 +1,114 @@
+package com.zhongzheng.controller.activity;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 活动配置Controller
+ * 
+ * @author change
+ * @date 2021-05-17
+ */
+@Api(value = "活动配置控制器", tags = {"活动配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/configuration")
+public class ActivityConfigurationController extends BaseController {
+
+    private final IActivityConfigurationService iActivityConfigurationService;
+
+    /**
+     * 查询活动配置列表
+     */
+    @ApiOperation("查询活动配置列表")
+    @PreAuthorize("@ss.hasPermi('system:configuration:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityConfigurationVo> list(ActivityConfigurationQueryBo bo) {
+        startPage();
+        List<ActivityConfigurationVo> list = iActivityConfigurationService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出活动配置列表
+     */
+ /*   @ApiOperation("导出活动配置列表")
+    @PreAuthorize("@ss.hasPermi('system:configuration:export')")
+    @Log(title = "活动配置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityConfigurationVo> export(ActivityConfigurationQueryBo bo) {
+        List<ActivityConfigurationVo> list = iActivityConfigurationService.queryList(bo);
+        ExcelUtil<ActivityConfigurationVo> util = new ExcelUtil<ActivityConfigurationVo>(ActivityConfigurationVo.class);
+        return util.exportExcel(list, "活动配置");
+    }*/
+
+    /**
+     * 获取活动配置详细信息
+     */
+    @ApiOperation("获取活动配置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:configuration:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ActivityConfigurationVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iActivityConfigurationService.queryById(id));
+    }
+
+    /**
+     * 新增活动配置
+     */
+    @ApiOperation("新增活动配置")
+    @PreAuthorize("@ss.hasPermi('system:configuration:add')")
+    @Log(title = "活动配置", businessType = BusinessType.INSERT)
+    @PostMapping("addConfig")
+    public AjaxResult<Void> add(@RequestBody ActivityConfigurationAddBo bo) {
+        return toAjax(iActivityConfigurationService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改活动配置
+     */
+    @ApiOperation("修改活动配置")
+    @PreAuthorize("@ss.hasPermi('system:configuration:edit')")
+    @Log(title = "活动配置", businessType = BusinessType.UPDATE)
+    @PostMapping("editConfig")
+    public AjaxResult<Void> edit(@RequestBody ActivityConfigurationEditBo bo) {
+        return toAjax(iActivityConfigurationService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除活动配置
+     */
+    @ApiOperation("删除活动配置")
+    @PreAuthorize("@ss.hasPermi('system:configuration:remove')")
+    @Log(title = "活动配置" , businessType = BusinessType.DELETE)
+    @PostMapping("/deleteConfig")
+    public AjaxResult<Void> remove(@RequestBody Long[] ids) {
+        return toAjax(iActivityConfigurationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingAddBo.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 广告发布储存添加对象 activity_advertising
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("广告发布储存添加对象")
+public class ActivityAdvertisingAddBo {
+
+    /** 广告图片 */
+    @ApiModelProperty("广告图片")
+    @NotNull(message = "广告图片 不能为空")
+    private String adverUrl;
+    /** 跳转url */
+    @ApiModelProperty("跳转url")
+    private String jumpUrl;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 有效时间开始时间 */
+    @ApiModelProperty("有效时间开始时间")
+    @NotNull(message = "有效时间开始时间 不能为空")
+    private Long startTime;
+    /** 有效期过期时间 */
+    @ApiModelProperty("有效期过期时间")
+    @NotNull(message = "有效期过期时间 不能为空")
+    private Long endTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+    /** 0 手动发布 1定时发布 */
+    @ApiModelProperty("0 手动发布 1定时发布")
+    @NotNull(message = "发布方式 不能为空")
+    private Integer reStatus;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+    /** 定时发布的时间 */
+    @ApiModelProperty("定时发布的时间")
+    private Long releaseTime;
+    /** 广告名称 */
+    @ApiModelProperty("广告名称")
+    @NotNull(message = "广告名称 不能为空")
+    private String advName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingEditBo.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 广告发布储存编辑对象 activity_advertising
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("广告发布储存编辑对象")
+public class ActivityAdvertisingEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 广告图片 */
+    @ApiModelProperty("广告图片")
+    private String adverUrl;
+
+    /** 跳转url */
+    @ApiModelProperty("跳转url")
+    private String jumpUrl;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 有效时间开始时间 */
+    @ApiModelProperty("有效时间开始时间")
+    private Long startTime;
+
+    /** 有效期过期时间 */
+    @ApiModelProperty("有效期过期时间")
+    private Long endTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /** 0 手动发布 1定时发布 */
+    @ApiModelProperty("0 手动发布 1定时发布")
+    private Integer reStatus;
+
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+
+    /** 定时发布的时间 */
+    @ApiModelProperty("定时发布的时间")
+    private Long releaseTime;
+
+    /** 广告名称 */
+    @ApiModelProperty("广告名称")
+    private String advName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingQueryBo.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.activity.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 广告发布储存分页查询对象 activity_advertising
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("广告发布储存分页查询对象")
+public class ActivityAdvertisingQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 广告图片 */
+	@ApiModelProperty("广告图片")
+	private String adverUrl;
+	/** 跳转url */
+	@ApiModelProperty("跳转url")
+	private String jumpUrl;
+	/** 有效时间开始时间 */
+	@ApiModelProperty("有效时间开始时间")
+	private Long startTime;
+	/** 有效期过期时间 */
+	@ApiModelProperty("有效期过期时间")
+	private Long endTime;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0 手动发布 1定时发布 */
+	@ApiModelProperty("0 手动发布 1定时发布")
+	private Integer reStatus;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 定时发布的时间 */
+	@ApiModelProperty("定时发布的时间")
+	private Long releaseTime;
+	/** 广告名称 */
+	@ApiModelProperty("广告名称")
+	private String advName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+
+
+/**
+ * 活动配置添加对象 activity_configuration
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("活动配置添加对象")
+public class ActivityConfigurationAddBo {
+
+    /** 活动名称 */
+    @ApiModelProperty("活动名称")
+    @NotNull(message = "活动名称 不能为空")
+    private String activityName;
+    /** 活动类型 */
+    @ApiModelProperty("活动类型")
+    @NotNull(message = "活动类型 不能为空")
+    private String activityType;
+    /** 活动介绍备注说明 */
+    @ApiModelProperty("活动介绍备注说明")
+    private String description;
+    /** 活动开始时间 */
+    @ApiModelProperty("活动开始时间")
+    @NotNull(message = "活动开始时间 不能为空")
+    private Long startTime;
+    /** 活动结束时间 */
+    @ApiModelProperty("活动结束时间")
+    @NotNull(message = "活动结束时间 不能为空")
+    private Long endTime;
+    /** 定价（适用于优惠券） */
+    @ApiModelProperty("定价（适用于优惠券）")
+    private Long price;
+    /** 发放数量 */
+    @ApiModelProperty("发放数量")
+    private Integer quantity;
+    /** 有效时间（适用券） */
+    @ApiModelProperty("有效时间（适用券）")
+    private Long validityTime;
+    /** 优惠折扣（适用折扣券） */
+    @ApiModelProperty("优惠折扣（适用折扣券）")
+    private String discount;
+    /** 直播内容（适用直播） */
+    @ApiModelProperty("直播内容（适用直播）")
+    private String liveContent;
+    /** 活动地址 */
+    @ApiModelProperty("活动地址")
+    private String liveAdress;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 0删除 1结束 2 撤回 3开始 4未开始 */
+    @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 活动配置编辑对象 activity_configuration
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("活动配置编辑对象")
+public class ActivityConfigurationEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 活动名称 */
+    @ApiModelProperty("活动名称")
+    private String activityName;
+
+    /** 活动类型 */
+    @ApiModelProperty("活动类型")
+    private String activityType;
+
+    /** 活动介绍备注说明 */
+    @ApiModelProperty("活动介绍备注说明")
+    private String description;
+
+    /** 活动开始时间 */
+    @ApiModelProperty("活动开始时间")
+    private Long startTime;
+
+    /** 活动结束时间 */
+    @ApiModelProperty("活动结束时间")
+    private Long endTime;
+
+    /** 定价（适用于优惠券） */
+    @ApiModelProperty("定价（适用于优惠券）")
+    private Long price;
+
+    /** 发放数量 */
+    @ApiModelProperty("发放数量")
+    private Integer quantity;
+
+    /** 有效时间（适用券） */
+    @ApiModelProperty("有效时间（适用券）")
+    private Long validityTime;
+
+    /** 优惠折扣（适用折扣券） */
+    @ApiModelProperty("优惠折扣（适用折扣券）")
+    private String discount;
+
+    /** 直播内容（适用直播） */
+    @ApiModelProperty("直播内容（适用直播）")
+    private String liveContent;
+
+    /** 活动地址 */
+    @ApiModelProperty("活动地址")
+    private String liveAdress;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 0删除 1结束 2 撤回 3开始 4未开始 */
+    @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 活动配置分页查询对象 activity_configuration
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("活动配置分页查询对象")
+public class ActivityConfigurationQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 活动名称 */
+	@ApiModelProperty("活动名称")
+	private String activityName;
+	/** 活动类型 */
+	@ApiModelProperty("活动类型")
+	private String activityType;
+	/** 活动介绍备注说明 */
+	@ApiModelProperty("活动介绍备注说明")
+	private String description;
+	/** 活动开始时间 */
+	@ApiModelProperty("活动开始时间")
+	private Long startTime;
+	/** 活动结束时间 */
+	@ApiModelProperty("活动结束时间")
+	private Long endTime;
+	/** 定价（适用于优惠券） */
+	@ApiModelProperty("定价（适用于优惠券）")
+	private Long price;
+	/** 发放数量 */
+	@ApiModelProperty("发放数量")
+	private Integer quantity;
+	/** 有效时间（适用券） */
+	@ApiModelProperty("有效时间（适用券）")
+	private Long validityTime;
+	/** 优惠折扣（适用折扣券） */
+	@ApiModelProperty("优惠折扣（适用折扣券）")
+	private String discount;
+	/** 直播内容（适用直播） */
+	@ApiModelProperty("直播内容（适用直播）")
+	private String liveContent;
+	/** 活动地址 */
+	@ApiModelProperty("活动地址")
+	private String liveAdress;
+	/** 0删除 1结束 2 撤回 3开始 4未开始 */
+	@ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityAdvertising.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.activity.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 广告发布储存对象 activity_advertising
+ * 
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_advertising")
+public class ActivityAdvertising implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 广告图片 */
+    private String adverUrl;
+
+    /** 跳转url */
+    private String jumpUrl;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 有效时间开始时间 */
+    private Long startTime;
+
+    /** 有效期过期时间 */
+    private Long endTime;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 0 手动发布 1定时发布 */
+    private Integer reStatus;
+
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    private Integer status;
+
+    /** 定时发布的时间 */
+    private Long releaseTime;
+
+    /** 广告名称 */
+    private String advName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -0,0 +1,75 @@
+package com.zhongzheng.modules.activity.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 活动配置对象 activity_configuration
+ * 
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_configuration")
+public class ActivityConfiguration implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 活动名称 */
+    private String activityName;
+
+    /** 活动类型 */
+    private String activityType;
+
+    /** 活动介绍备注说明 */
+    private String description;
+
+    /** 活动开始时间 */
+    private Long startTime;
+
+    /** 活动结束时间 */
+    private Long endTime;
+
+    /** 定价（适用于优惠券） */
+    private Long price;
+
+    /** 发放数量 */
+    private Integer quantity;
+
+    /** 有效时间（适用券） */
+    private Long validityTime;
+
+    /** 优惠折扣（适用折扣券） */
+    private String discount;
+
+    /** 直播内容（适用直播） */
+    private String liveContent;
+
+    /** 活动地址 */
+    private String liveAdress;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 0删除 1结束 2 撤回 3开始 4未开始 */
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityAdvertisingMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
+
+/**
+ * 广告发布储存Mapper接口
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+public interface ActivityAdvertisingMapper extends BaseMapper<ActivityAdvertising> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+
+/**
+ * 活动配置Mapper接口
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfiguration> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityAdvertisingService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.activity.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
+import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 广告发布储存Service接口
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+public interface IActivityAdvertisingService extends IService<ActivityAdvertising> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityAdvertisingVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入广告发布储存
+	 * @param bo 广告发布储存新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityAdvertisingAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改广告发布储存
+	 * @param bo 广告发布储存编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityAdvertisingEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 活动配置Service接口
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+public interface IActivityConfigurationService extends IService<ActivityConfiguration> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityConfigurationVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入活动配置
+	 * @param bo 活动配置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityConfigurationAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改活动配置
+	 * @param bo 活动配置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityConfigurationEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -0,0 +1,110 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
+import com.zhongzheng.modules.activity.mapper.ActivityAdvertisingMapper;
+import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
+import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 广告发布储存Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Service
+public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
+
+    @Override
+    public ActivityAdvertisingVo queryById(Long id){
+        ActivityAdvertising db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityAdvertisingVo.class);
+    }
+
+    @Override
+    public List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo) {
+        LambdaQueryWrapper<ActivityAdvertising> lqw = Wrappers.lambdaQuery();
+        lqw.ne(bo.getStatus() == null,ActivityAdvertising::getStatus,0);
+        lqw.eq(StrUtil.isNotBlank(bo.getAdverUrl()), ActivityAdvertising::getAdverUrl, bo.getAdverUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getJumpUrl()), ActivityAdvertising::getJumpUrl, bo.getJumpUrl());
+        lqw.eq(bo.getStartTime() != null, ActivityAdvertising::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, ActivityAdvertising::getEndTime, bo.getEndTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
+        lqw.eq(bo.getReStatus() != null, ActivityAdvertising::getReStatus, bo.getReStatus());
+        lqw.eq(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
+        lqw.eq(bo.getReleaseTime() != null, ActivityAdvertising::getReleaseTime, bo.getReleaseTime());
+        lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityAdvertisingVo> entity2Vo(Collection<ActivityAdvertising> collection) {
+        List<ActivityAdvertisingVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityAdvertisingVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityAdvertising> page = (Page<ActivityAdvertising>)collection;
+            Page<ActivityAdvertisingVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityAdvertisingAddBo bo) {
+        ActivityAdvertising add = BeanUtil.toBean(bo, ActivityAdvertising.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    @Transactional
+    public Boolean updateByEditBo(ActivityAdvertisingEditBo bo) {
+        ActivityAdvertising update = BeanUtil.toBean(bo, ActivityAdvertising.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityAdvertising entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        ArrayList<ActivityAdvertising> activityAdvertisingList = new ArrayList<>();
+        ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0)));
+        return this.updateBatchById(activityAdvertisingList);
+    }
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -0,0 +1,108 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 活动配置Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Service
+public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfigurationMapper, ActivityConfiguration> implements IActivityConfigurationService {
+
+    @Override
+    public ActivityConfigurationVo queryById(Long id){
+        ActivityConfiguration db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityConfigurationVo.class);
+    }
+
+    @Override
+    public List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
+        LambdaQueryWrapper<ActivityConfiguration> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getActivityName()), ActivityConfiguration::getActivityName, bo.getActivityName());
+        lqw.eq(StrUtil.isNotBlank(bo.getActivityType()), ActivityConfiguration::getActivityType, bo.getActivityType());
+        lqw.eq(StrUtil.isNotBlank(bo.getDescription()), ActivityConfiguration::getDescription, bo.getDescription());
+        lqw.eq(bo.getStartTime() != null, ActivityConfiguration::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, ActivityConfiguration::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getPrice() != null, ActivityConfiguration::getPrice, bo.getPrice());
+        lqw.eq(bo.getQuantity() != null, ActivityConfiguration::getQuantity, bo.getQuantity());
+        lqw.eq(bo.getValidityTime() != null, ActivityConfiguration::getValidityTime, bo.getValidityTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getDiscount()), ActivityConfiguration::getDiscount, bo.getDiscount());
+        lqw.eq(StrUtil.isNotBlank(bo.getLiveContent()), ActivityConfiguration::getLiveContent, bo.getLiveContent());
+        lqw.eq(StrUtil.isNotBlank(bo.getLiveAdress()), ActivityConfiguration::getLiveAdress, bo.getLiveAdress());
+        lqw.eq(bo.getStatus() != null, ActivityConfiguration::getStatus, bo.getStatus());
+        lqw.ne(bo.getStatus() == null, ActivityConfiguration::getStatus, 0);
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityConfigurationVo> entity2Vo(Collection<ActivityConfiguration> collection) {
+        List<ActivityConfigurationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityConfiguration> page = (Page<ActivityConfiguration>)collection;
+            Page<ActivityConfigurationVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityConfigurationAddBo bo) {
+        ActivityConfiguration add = BeanUtil.toBean(bo, ActivityConfiguration.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityConfigurationEditBo bo) {
+        ActivityConfiguration update = BeanUtil.toBean(bo, ActivityConfiguration.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityConfiguration entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        ArrayList<ActivityConfiguration> activityConfigurations = new ArrayList<>();
+        ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0)));
+        return this.updateBatchById(activityConfigurations);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityAdvertisingVo.java

@@ -0,0 +1,61 @@
+package com.zhongzheng.modules.activity.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 广告发布储存视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("广告发布储存视图对象")
+public class ActivityAdvertisingVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 广告图片 */
+	@Excel(name = "广告图片")
+	@ApiModelProperty("广告图片")
+	private String adverUrl;
+	/** 跳转url */
+	@Excel(name = "跳转url")
+	@ApiModelProperty("跳转url")
+	private String jumpUrl;
+	/** 有效时间开始时间 */
+	@Excel(name = "有效时间开始时间")
+	@ApiModelProperty("有效时间开始时间")
+	private Long startTime;
+	/** 有效期过期时间 */
+	@Excel(name = "有效期过期时间")
+	@ApiModelProperty("有效期过期时间")
+	private Long endTime;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0 手动发布 1定时发布 */
+	@Excel(name = "0 手动发布 1定时发布")
+	@ApiModelProperty("0 手动发布 1定时发布")
+	private Integer reStatus;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@Excel(name = "0删除 1待发布 2 撤回 3发布成功")
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 定时发布的时间 */
+	@Excel(name = "定时发布的时间")
+	@ApiModelProperty("定时发布的时间")
+	private Long releaseTime;
+	/** 广告名称 */
+	@Excel(name = "广告名称")
+	@ApiModelProperty("广告名称")
+	private String advName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.activity.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 活动配置视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Data
+@ApiModel("活动配置视图对象")
+public class ActivityConfigurationVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 活动名称 */
+	@Excel(name = "活动名称")
+	@ApiModelProperty("活动名称")
+	private String activityName;
+	/** 活动类型 */
+	@Excel(name = "活动类型")
+	@ApiModelProperty("活动类型")
+	private String activityType;
+	/** 活动介绍备注说明 */
+	@Excel(name = "活动介绍备注说明")
+	@ApiModelProperty("活动介绍备注说明")
+	private String description;
+	/** 活动开始时间 */
+	@Excel(name = "活动开始时间")
+	@ApiModelProperty("活动开始时间")
+	private Long startTime;
+	/** 活动结束时间 */
+	@Excel(name = "活动结束时间")
+	@ApiModelProperty("活动结束时间")
+	private Long endTime;
+	/** 定价（适用于优惠券） */
+	@Excel(name = "定价" , readConverterExp = "适=用于优惠券")
+	@ApiModelProperty("定价（适用于优惠券）")
+	private Long price;
+	/** 发放数量 */
+	@Excel(name = "发放数量")
+	@ApiModelProperty("发放数量")
+	private Integer quantity;
+	/** 有效时间（适用券） */
+	@Excel(name = "有效时间" , readConverterExp = "适=用券")
+	@ApiModelProperty("有效时间（适用券）")
+	private Long validityTime;
+	/** 优惠折扣（适用折扣券） */
+	@Excel(name = "优惠折扣" , readConverterExp = "适=用折扣券")
+	@ApiModelProperty("优惠折扣（适用折扣券）")
+	private String discount;
+	/** 直播内容（适用直播） */
+	@Excel(name = "直播内容" , readConverterExp = "适=用直播")
+	@ApiModelProperty("直播内容（适用直播）")
+	private String liveContent;
+	/** 活动地址 */
+	@Excel(name = "活动地址")
+	@ApiModelProperty("活动地址")
+	private String liveAdress;
+	/** 0删除 1结束 2 撤回 3开始 4未开始 */
+	@Excel(name = "0删除 1结束 2 撤回 3开始 4未开始")
+	@ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
+	private Integer status;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityAdvertisingMapper.xml

@@ -0,0 +1,23 @@
+<?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.zhongzheng.system.mapper.ActivityAdvertisingMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityAdvertising" id="ActivityAdvertisingResult">
+        <result property="id" column="id"/>
+        <result property="adverUrl" column="adver_url"/>
+        <result property="jumpUrl" column="jump_url"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="remarks" column="remarks"/>
+        <result property="reStatus" column="re_status"/>
+        <result property="status" column="status"/>
+        <result property="releaseTime" column="release_time"/>
+        <result property="advName" column="adv_name"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -0,0 +1,26 @@
+<?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.zhongzheng.system.mapper.ActivityConfigurationMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityConfiguration" id="ActivityConfigurationResult">
+        <result property="id" column="id"/>
+        <result property="activityName" column="activity_name"/>
+        <result property="activityType" column="activity_type"/>
+        <result property="description" column="description"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="price" column="price"/>
+        <result property="quantity" column="quantity"/>
+        <result property="validityTime" column="validity_time"/>
+        <result property="discount" column="discount"/>
+        <result property="liveContent" column="live_content"/>
+        <result property="liveAdress" column="live_adress"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>