From 40a9e7c1fb8f6ff0a23430f1d5bc834379e0df2b Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 30 Mar 2021 09:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/ry-ui.js   |  45 +++
 .../controller/DrawConfigController.java      | 150 ++++++++++
 .../controller/DrawInfoController.java        | 180 +++++++++++
 .../sinosoft/activity/domain/DrawConfig.java  | 281 ++++++++++++++++++
 .../sinosoft/activity/domain/DrawInfo.java    | 217 ++++++++++++++
 .../sinosoft/activity/domain/DrawRule.java    | 199 +++++++++++++
 .../activity/mapper/DrawConfigMapper.java     |  62 ++++
 .../activity/mapper/DrawInfoMapper.java       |  63 ++++
 .../activity/mapper/DrawRuleMapper.java       |  62 ++++
 .../activity/service/IDrawConfigService.java  |  62 ++++
 .../activity/service/IDrawInfoService.java    |  63 ++++
 .../activity/service/IDrawRuleService.java    |  63 ++++
 .../service/impl/DrawConfigServiceImpl.java   |  96 ++++++
 .../service/impl/DrawInfoServiceImpl.java     |  96 ++++++
 .../service/impl/DrawRuleServiceImpl.java     |  96 ++++++
 .../mapper/activity/DrawConfigMapper.xml      | 157 ++++++++++
 .../mapper/activity/DrawInfoMapper.xml        | 156 ++++++++++
 .../mapper/activity/DrawRuleMapper.xml        | 114 +++++++
 .../templates/activity/info/add.html          | 243 +++++++++++++++
 .../templates/activity/info/configAdd.html    | 174 +++++++++++
 .../templates/activity/info/configEdit.html   | 181 +++++++++++
 .../templates/activity/info/configList.html   | 146 +++++++++
 .../templates/activity/info/edit.html         | 258 ++++++++++++++++
 .../templates/activity/info/info.html         | 173 +++++++++++
 24 files changed, 3337 insertions(+)
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRule.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawConfigMapper.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
 create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java
 create mode 100644 sino-activity/src/main/resources/mapper/activity/DrawConfigMapper.xml
 create mode 100644 sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
 create mode 100644 sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/add.html
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/configAdd.html
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/configEdit.html
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/configList.html
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/edit.html
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/info.html

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index f5c0d8544..9de3eba0a 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -900,6 +900,50 @@ var table = {
             	});
                 layer.full(index);
             },
+
+
+            // 弹出层全屏
+            openInFoFull: function (title, url, width, height) {
+                // 如果是移动端，就使用自适应大小弹窗
+                if ($.common.isMobile()) {
+                    width = 'auto';
+                    height = 'auto';
+                }
+                if ($.common.isEmpty(title)) {
+                    title = false;
+                }
+                if ($.common.isEmpty(url)) {
+                    url = "/404.html";
+                }
+                if ($.common.isEmpty(width)) {
+                    width = 800;
+                }
+                if ($.common.isEmpty(height)) {
+                    height = ($(window).height() - 50);
+                }
+                var index = layer.open({
+                    type: 2,
+                    area: [width + 'px', height + 'px'],
+                    fix: false,
+                    //不固定
+                    maxmin: true,
+                    shade: 0.3,
+                    title: title,
+                    content: url,
+                    btn: ['关闭'],
+                    // 弹层外区域关闭
+                    shadeClose: true,
+                    yes: function (index, layero) {
+                        layer.close(index);
+                    }
+                });
+                layer.full(index);
+            },
+
+
+
+
+
             // 选卡页方式打开
             openTab: function (title, url, isRefresh) {
             	createMenuItem(url, title, isRefresh);
@@ -1153,6 +1197,7 @@ var table = {
 	                    	$.modal.alertError(result.msg);
 	                    }
         	            $.modal.closeLoading();
+                        $.modal.reload();
         	        }
         	    };
         	    $.ajax(config)
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
new file mode 100644
index 000000000..2c81d162e
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
@@ -0,0 +1,150 @@
+package com.sinosoft.activity.controller;
+
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.sinosoft.activity.domain.DrawConfig;
+import com.sinosoft.activity.domain.DrawPrizeInfo;
+import com.sinosoft.activity.service.IDrawConfigService;
+import com.sinosoft.activity.service.IDrawPrizeInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 存储奖项配置信息Controller
+ *
+ * @author ruoyi
+ * @date 2021-03-26
+ */
+@Controller
+@RequestMapping("/activity/config")
+public class DrawConfigController extends BaseController
+{
+    private String prefix = "activity/info";
+
+    @Autowired
+    private IDrawConfigService drawConfigService;
+
+    @Autowired
+    private IDrawPrizeInfoService iDrawPrizeInfoService;
+    @RequiresPermissions("activity:config:view")
+    @GetMapping()
+    public String config()
+    {
+        return prefix + "/configList";
+    }
+
+    /**
+     * 查询存储奖项配置信息列表
+     */
+    @RequiresPermissions("activity:config:list")
+    @PostMapping("/{DRAWCODE}/list")
+    @ResponseBody
+    public TableDataInfo list(DrawConfig drawConfig)
+    {
+        startPage();
+        List<DrawConfig> list = drawConfigService.selectDrawConfigList(drawConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出存储奖项配置信息列表
+     */
+    @RequiresPermissions("activity:config:export")
+    @Log(title = "存储奖项配置信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(DrawConfig drawConfig)
+    {
+        List<DrawConfig> list = drawConfigService.selectDrawConfigList(drawConfig);
+        ExcelUtil<DrawConfig> util = new ExcelUtil<DrawConfig>(DrawConfig.class);
+        return util.exportExcel(list, "config");
+    }
+
+    /**
+     * 新增存储奖项配置信息
+     */
+    @GetMapping("/add/{id}")
+    public String add(@PathVariable("id")String DRAWCODE ,ModelMap mapp)
+    {
+        mapp.put("DRAWCODE",DRAWCODE);
+        return prefix + "/configAdd";
+    }
+
+    /**
+     * 新增保存存储奖项配置信息
+     */
+    @RequiresPermissions("activity:config:add")
+    @Log(title = "存储奖项配置信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(DrawConfig drawConfig)
+    {
+        drawConfig.setCREATETIMESTAMP(new Date());
+        return toAjax(drawConfigService.insertDrawConfig(drawConfig));
+    }
+
+    /**
+     * 修改存储奖项配置信息
+     */
+    @GetMapping("/edit/{DRAWCONFIGID}")
+    public String edit(@PathVariable("DRAWCONFIGID") String DRAWCONFIGID, ModelMap mmap)
+    {
+        DrawConfig drawConfig = drawConfigService.selectDrawConfigById(DRAWCONFIGID);
+        mmap.put("drawConfig", drawConfig);
+        return prefix + "/configEdit";
+    }
+
+    /**
+     * 修改保存存储奖项配置信息
+     */
+    @RequiresPermissions("activity:config:edit")
+    @Log(title = "存储奖项配置信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(DrawConfig drawConfig)
+    {
+        drawConfig.setLASTUPDATETIMESTAMP(new Date());
+        return toAjax(drawConfigService.updateDrawConfig(drawConfig));
+    }
+
+    /**
+     * 删除存储奖项配置信息
+     */
+    @RequiresPermissions("activity:config:remove")
+    @Log(title = "存储奖项配置信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(drawConfigService.deleteDrawConfigByIds(ids));
+    }
+
+
+    /**
+     * 获取存储奖品的基础信息对象
+     *
+     * @return
+     */
+    @GetMapping("/prizeInfo")
+    @ResponseBody
+    public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo) {
+
+        return iDrawPrizeInfoService.selectDrawPrizeInfoList(drawPrizeInfo);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
new file mode 100644
index 000000000..6ca42a447
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
@@ -0,0 +1,180 @@
+package com.sinosoft.activity.controller;
+
+import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+import com.alibaba.fastjson.JSON;
+import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.domain.DrawPrizeInfo;
+import com.sinosoft.activity.domain.DrawRule;
+import com.sinosoft.activity.service.IDrawInfoService;
+import com.sinosoft.activity.service.IDrawPrizeInfoService;
+import com.sinosoft.activity.service.IDrawRuleService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 抽奖活动管理Controller
+ * 
+ * @author xlh
+ * @date 2021-03-25
+ */
+@Controller
+@RequestMapping("/activity/info")
+public class DrawInfoController extends BaseController
+{
+    private String prefix = "activity/info";
+
+    @Autowired
+    private IDrawInfoService drawInfoService;
+
+    @RequiresPermissions("activity:info:view")
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/info";
+    }
+
+    @Autowired
+    private IDrawPrizeInfoService iDrawPrizeInfoService;
+
+    @Autowired
+    private IDrawRuleService iDrawRuleService;
+    /**
+     * 查询抽奖活动管理列表
+     */
+    @RequiresPermissions("activity:info:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(DrawInfo drawInfo)
+    {
+        startPage();
+        List<DrawInfo> list = drawInfoService.selectDrawInfoList(drawInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出抽奖活动管理列表
+     */
+    @RequiresPermissions("activity:info:export")
+    @Log(title = "抽奖活动管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(DrawInfo drawInfo)
+    {
+        List<DrawInfo> list = drawInfoService.selectDrawInfoList(drawInfo);
+        ExcelUtil<DrawInfo> util = new ExcelUtil<DrawInfo>(DrawInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 新增抽奖活动管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存抽奖活动管理
+     */
+    @RequiresPermissions("activity:info:add")
+    @Log(title = "抽奖活动管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(DrawInfo drawInfo)
+    {
+        logger.info("前台传参"+ JSON.toJSONString(drawInfo));
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        Date date = new Date();
+        drawInfo.setCREATETIMESTAMP(date);
+        String format1 = format.format(date);
+        drawInfo.setDRAWCODE(format1);
+         drawInfoService.insertDrawInfo(drawInfo);
+        DrawRule drawRule = new  DrawRule();
+        BeanUtils.copyProperties(drawInfo,drawRule);
+        logger.info("接口新增"+ JSON.toJSONString(drawRule));
+        int i = iDrawRuleService.insertDrawRule(drawRule);
+        return toAjax(i);
+    }
+
+    /**
+     * 修改抽奖活动管理
+     */
+    @GetMapping("/edit/{DRAWID}")
+    public String edit(@PathVariable("DRAWID") String DRAWID, ModelMap mmap)
+    {
+        DrawInfo drawInfo = drawInfoService.selectDrawInfoById(DRAWID);
+        mmap.put("drawInfo", drawInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存抽奖活动管理
+     */
+    @RequiresPermissions("activity:info:edit")
+    @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(DrawInfo drawInfo)
+    {
+        logger.info("修改存储抽奖特殊规则对象传参："+JSON.toJSONString(drawInfo));
+        drawInfo.setLASTUPDATETIMESTAMP(new Date());
+        drawInfoService.updateDrawInfo(drawInfo);
+        DrawRule drawRule = new  DrawRule();
+        BeanUtils.copyProperties(drawInfo,drawRule);
+        logger.info("修改存储抽奖特殊规则对象入参："+JSON.toJSONString(drawRule));
+        int i = iDrawRuleService.updateDrawRule(drawRule);
+        return toAjax(i);
+    }
+
+    /**
+     * 删除抽奖活动管理
+     */
+    @RequiresPermissions("activity:info:remove")
+    @Log(title = "抽奖活动管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(drawInfoService.deleteDrawInfoByIds(ids));
+    }
+
+    /**
+     * 获取存储奖品的基础信息对象
+     *
+     * @return
+     */
+    @GetMapping("/prizeInfo")
+    @ResponseBody
+    public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo) {
+
+        return iDrawPrizeInfoService.selectDrawPrizeInfoList(drawPrizeInfo);
+    }
+
+    @RequestMapping("/prizeDetail/{DRAWCODE}/{DRAWNAME}")
+    public String  prizeDetail(@PathVariable("DRAWCODE") String  DRAWCODE ,@PathVariable("DRAWNAME") String  DRAWNAME , ModelMap mapp){
+        mapp.put("DRAWCODE",DRAWCODE);
+        mapp.put("DRAWNAME", URLDecoder.decode(DRAWNAME));
+        return prefix + "/configList";
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
new file mode 100644
index 000000000..3bf55369c
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
@@ -0,0 +1,281 @@
+package com.sinosoft.activity.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 存储奖项配置信息对象 draw_config
+ *
+ * @author xlh
+ * @date 2021-03-26
+ */
+public class DrawConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 业务主键 */
+    private String DRAWCONFIGID;
+
+    /** 奖品代码 */
+    @Excel(name = "奖品代码")
+    private String PRIZECODE;
+
+    /** 抽奖活动代码 */
+    @Excel(name = "抽奖活动代码")
+    private String DRAWCODE;
+
+    /** 概率 */
+    @Excel(name = "概率")
+    private String PROBABILITY;
+
+    /** 显示序号 */
+    @Excel(name = "显示序号")
+    private String DISPLAYORDER;
+
+    /** 奖品等级 */
+    @Excel(name = "奖品等级", readConverterExp="blank=空奖品,prizeLevel1=一等奖,prizeLevel2=二等奖,prizeLevel3=三等奖,prizeLevel4=四等奖,prizeLevel5=五等奖,prizeLevel6=六等奖,prizeLevel7=七等奖")
+    private String PRIZELEVEL;
+
+    /** 提示信息 */
+    @Excel(name = "提示信息")
+    private String CUE;
+
+    /** 奖品总数量 */
+    @Excel(name = "奖品总数量")
+    private Long TOTALNUMBER;
+
+    /** 奖品剩余数量 */
+    @Excel(name = "奖品剩余数量")
+    private Long AVAILABLENUMBER;
+
+    /** 状态 */
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    private String STATUS;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date CREATETIMESTAMP;
+
+    /** 最后修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date LASTUPDATETIMESTAMP;
+
+    /** 中奖次数限制 */
+    @Excel(name = "中奖次数限制",readConverterExp="none=无限制,distinction=当个活动限制,nodistinction=不区分活动限制")
+    private String AWARDTYPE;
+
+    /** 中奖次数限制值 */
+    @Excel(name = "中奖次数限制值" )
+    private Long AWARDTYPEVALUE;
+
+    /** 领取方式 */
+    @Excel(name = "领取方式" ,readConverterExp = "0=手动领取,1=自动领取")
+    private String AWARDMETHOD;
+
+    /**  */
+    private String SENDMSGFLAG;
+
+    /**  */
+    private String MSGTEMPLETEID;
+
+    private String PRIZENAME;
+
+    public String getPRIZENAME() {
+        return PRIZENAME;
+    }
+
+    public void setPRIZENAME(String PRIZENAME) {
+        this.PRIZENAME = PRIZENAME;
+    }
+
+    public void setDRAWCONFIGID(String DRAWCONFIGID)
+    {
+        this.DRAWCONFIGID = DRAWCONFIGID;
+    }
+
+    public String getDRAWCONFIGID()
+    {
+        return DRAWCONFIGID;
+    }
+    public void setPRIZECODE(String PRIZECODE)
+    {
+        this.PRIZECODE = PRIZECODE;
+    }
+
+    public String getPRIZECODE()
+    {
+        return PRIZECODE;
+    }
+    public void setDRAWCODE(String DRAWCODE)
+    {
+        this.DRAWCODE = DRAWCODE;
+    }
+
+    public String getDRAWCODE()
+    {
+        return DRAWCODE;
+    }
+    public void setPROBABILITY(String PROBABILITY)
+    {
+        this.PROBABILITY = PROBABILITY;
+    }
+
+    public String getPROBABILITY()
+    {
+        return PROBABILITY;
+    }
+    public void setDISPLAYORDER(String DISPLAYORDER)
+    {
+        this.DISPLAYORDER = DISPLAYORDER;
+    }
+
+    public String getDISPLAYORDER()
+    {
+        return DISPLAYORDER;
+    }
+    public void setPRIZELEVEL(String PRIZELEVEL)
+    {
+        this.PRIZELEVEL = PRIZELEVEL;
+    }
+
+    public String getPRIZELEVEL()
+    {
+        return PRIZELEVEL;
+    }
+    public void setCUE(String CUE)
+    {
+        this.CUE = CUE;
+    }
+
+    public String getCUE()
+    {
+        return CUE;
+    }
+    public void setTOTALNUMBER(Long TOTALNUMBER)
+    {
+        this.TOTALNUMBER = TOTALNUMBER;
+    }
+
+    public Long getTOTALNUMBER()
+    {
+        return TOTALNUMBER;
+    }
+    public void setAVAILABLENUMBER(Long AVAILABLENUMBER)
+    {
+        this.AVAILABLENUMBER = AVAILABLENUMBER;
+    }
+
+    public Long getAVAILABLENUMBER()
+    {
+        return AVAILABLENUMBER;
+    }
+    public void setSTATUS(String STATUS)
+    {
+        this.STATUS = STATUS;
+    }
+
+    public String getSTATUS()
+    {
+        return STATUS;
+    }
+    public void setCREATETIMESTAMP(Date CREATETIMESTAMP)
+    {
+        this.CREATETIMESTAMP = CREATETIMESTAMP;
+    }
+
+    public Date getCREATETIMESTAMP()
+    {
+        return CREATETIMESTAMP;
+    }
+    public void setLASTUPDATETIMESTAMP(Date LASTUPDATETIMESTAMP)
+    {
+        this.LASTUPDATETIMESTAMP = LASTUPDATETIMESTAMP;
+    }
+
+    public Date getLASTUPDATETIMESTAMP()
+    {
+        return LASTUPDATETIMESTAMP;
+    }
+    public void setAWARDTYPE(String AWARDTYPE)
+    {
+        this.AWARDTYPE = AWARDTYPE;
+    }
+
+    public String getAWARDTYPE()
+    {
+        return AWARDTYPE;
+    }
+    public void setAWARDTYPEVALUE(Long AWARDTYPEVALUE)
+    {
+        this.AWARDTYPEVALUE = AWARDTYPEVALUE;
+    }
+
+    public Long getAWARDTYPEVALUE()
+    {
+        return AWARDTYPEVALUE;
+    }
+    public void setAWARDMETHOD(String AWARDMETHOD)
+    {
+        this.AWARDMETHOD = AWARDMETHOD;
+    }
+
+    public String getAWARDMETHOD()
+    {
+        return AWARDMETHOD;
+    }
+    public void setSENDMSGFLAG(String SENDMSGFLAG)
+    {
+        this.SENDMSGFLAG = SENDMSGFLAG;
+    }
+
+    public String getSENDMSGFLAG()
+    {
+        return SENDMSGFLAG;
+    }
+    public void setMSGTEMPLETEID(String MSGTEMPLETEID)
+    {
+        this.MSGTEMPLETEID = MSGTEMPLETEID;
+    }
+
+    public String getMSGTEMPLETEID()
+    {
+        return MSGTEMPLETEID;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("DRAWCONFIGID", getDRAWCONFIGID())
+                .append("PRIZECODE", getPRIZECODE())
+                .append("DRAWCODE", getDRAWCODE())
+                .append("PROBABILITY", getPROBABILITY())
+                .append("DISPLAYORDER", getDISPLAYORDER())
+                .append("PRIZELEVEL", getPRIZELEVEL())
+                .append("CUE", getCUE())
+                .append("TOTALNUMBER", getTOTALNUMBER())
+                .append("AVAILABLENUMBER", getAVAILABLENUMBER())
+                .append("STATUS", getSTATUS())
+                .append("CREATETIMESTAMP", getCREATETIMESTAMP())
+                .append("LASTUPDATETIMESTAMP", getLASTUPDATETIMESTAMP())
+                .append("AWARDTYPE", getAWARDTYPE())
+                .append("AWARDTYPEVALUE", getAWARDTYPEVALUE())
+                .append("AWARDMETHOD", getAWARDMETHOD())
+                .append("SENDMSGFLAG", getSENDMSGFLAG())
+                .append("MSGTEMPLETEID", getMSGTEMPLETEID())
+                .toString();
+    }
+}
+
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
new file mode 100644
index 000000000..8dab0e21a
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
@@ -0,0 +1,217 @@
+package com.sinosoft.activity.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import java.util.Date;
+
+/**
+ * 抽奖活动管理对象 draw_info
+ *
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public class DrawInfo extends DrawRule
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String DRAWID;
+
+    /** 抽奖活动代码 */
+    @Excel(name = "抽奖活动代码")
+    private String DRAWCODE;
+
+    /** 抽奖活动类型 */
+    @Excel(name = "抽奖活动类型")
+    private String DRAWTYPE;
+
+    /** 抽奖活动名称 */
+    @Excel(name = "抽奖活动名称")
+    private String DRAWNAME;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date STARTTIME;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date ENDTIME;
+
+    /** 消耗对象 */
+    @Excel(name = "消耗对象",readConverterExp ="integral=积分,task=抽奖次数")
+    private String EXPENO;
+
+    /** 消耗价值 */
+    @Excel(name = "消耗价值")
+    private Long EXPENOVALUE;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String COMMENTS;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date CREATETIMESTAMP;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date LASTUPDATETIMESTAMP;
+
+    /** 状态 */
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    private String STATUS;
+
+    /** 是否需要更新缓存 */
+    @Excel(name = "是否需要更新缓存")
+    private String UPDATEFLAG;
+
+    /** 规则描述 */
+    @Excel(name = "规则描述")
+    private String RULEDESCRIPTION;
+
+    /**  */
+    private String VALIDATETYPE;
+
+
+    public void setDRAWID(String DRAWID)
+    {
+        this.DRAWID = DRAWID;
+    }
+
+    public String getDRAWID()
+    {
+        return DRAWID;
+    }
+    public void setDRAWCODE(String DRAWCODE)
+    {
+        this.DRAWCODE = DRAWCODE;
+    }
+
+    public String getDRAWCODE()
+    {
+        return DRAWCODE;
+    }
+    public void setDRAWTYPE(String DRAWTYPE)
+    {
+        this.DRAWTYPE = DRAWTYPE;
+    }
+
+    public String getDRAWTYPE()
+    {
+        return DRAWTYPE;
+    }
+    public void setDRAWNAME(String DRAWNAME)
+    {
+        this.DRAWNAME = DRAWNAME;
+    }
+
+    public String getDRAWNAME()
+    {
+        return DRAWNAME;
+    }
+    public void setSTARTTIME(Date STARTTIME)
+    {
+        this.STARTTIME = STARTTIME;
+    }
+
+    public Date getSTARTTIME()
+    {
+        return STARTTIME;
+    }
+    public void setENDTIME(Date ENDTIME)
+    {
+        this.ENDTIME = ENDTIME;
+    }
+
+    public Date getENDTIME()
+    {
+        return ENDTIME;
+    }
+    public void setEXPENO(String EXPENO)
+    {
+        this.EXPENO = EXPENO;
+    }
+
+    public String getEXPENO()
+    {
+        return EXPENO;
+    }
+    public void setEXPENOVALUE(Long EXPENOVALUE)
+    {
+        this.EXPENOVALUE = EXPENOVALUE;
+    }
+
+    public Long getEXPENOVALUE()
+    {
+        return EXPENOVALUE;
+    }
+    public void setCOMMENTS(String COMMENTS)
+    {
+        this.COMMENTS = COMMENTS;
+    }
+
+    public String getCOMMENTS()
+    {
+        return COMMENTS;
+    }
+    public void setCREATETIMESTAMP(Date CREATETIMESTAMP)
+    {
+        this.CREATETIMESTAMP = CREATETIMESTAMP;
+    }
+
+    public Date getCREATETIMESTAMP()
+    {
+        return CREATETIMESTAMP;
+    }
+    public void setLASTUPDATETIMESTAMP(Date LASTUPDATETIMESTAMP)
+    {
+        this.LASTUPDATETIMESTAMP = LASTUPDATETIMESTAMP;
+    }
+
+    public Date getLASTUPDATETIMESTAMP()
+    {
+        return LASTUPDATETIMESTAMP;
+    }
+    public void setSTATUS(String STATUS)
+    {
+        this.STATUS = STATUS;
+    }
+
+    public String getSTATUS()
+    {
+        return STATUS;
+    }
+    public void setUPDATEFLAG(String UPDATEFLAG)
+    {
+        this.UPDATEFLAG = UPDATEFLAG;
+    }
+
+    public String getUPDATEFLAG()
+    {
+        return UPDATEFLAG;
+    }
+    public void setRULEDESCRIPTION(String RULEDESCRIPTION)
+    {
+        this.RULEDESCRIPTION = RULEDESCRIPTION;
+    }
+
+    public String getRULEDESCRIPTION()
+    {
+        return RULEDESCRIPTION;
+    }
+    public void setVALIDATETYPE(String VALIDATETYPE)
+    {
+        this.VALIDATETYPE = VALIDATETYPE;
+    }
+
+    public String getVALIDATETYPE()
+    {
+        return VALIDATETYPE;
+    }
+
+
+}
\ No newline at end of file
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRule.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRule.java
new file mode 100644
index 000000000..466c45693
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRule.java
@@ -0,0 +1,199 @@
+package com.sinosoft.activity.domain;
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+
+/**
+ * 存储抽奖特殊规则对象 draw_rule
+ *
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public class DrawRule extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 业务主键 */
+    private String DRAWRULEID;
+
+    /** 抽奖活动代码 */
+    private String DRAWCODE;
+
+    /** 首次抽奖配置标志 */
+    private String FIRSTFLAG;
+
+    /** 首次抽奖必中奖品编码 */
+    private String FIRSTAWARDPRIZE;
+
+    /** 日抽奖次数限制标志 */
+    private String DAILYFLAG;
+
+    /** 日抽奖限制开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date DAILYSTARTTIME;
+
+    /** 日抽奖限制结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date DAILYENDTIME;
+
+    /** 日抽奖限制次数 */
+    private Long DAILYNUMBER;
+
+    /** N次抽奖必中标志 */
+    private String WILLDRAWFLAG;
+
+    /** N次抽奖必中奖品 */
+    private String WILLDRAWAWARDPRIZE;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date CREATETIMESTAMP;
+
+    /** 最后修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date LASTUPDATETIMESTAMP;
+
+    /** N次抽奖必中基数 */
+    private Long WILLDRAWAWARDNUMBER;
+
+    public String getDRAWCODE() {
+        return DRAWCODE;
+    }
+
+    public void setDRAWCODE(String DRAWCODE) {
+        this.DRAWCODE = DRAWCODE;
+    }
+
+    public Date getCREATETIMESTAMP() {
+        return CREATETIMESTAMP;
+    }
+
+    public void setCREATETIMESTAMP(Date CREATETIMESTAMP) {
+        this.CREATETIMESTAMP = CREATETIMESTAMP;
+    }
+
+    public Date getLASTUPDATETIMESTAMP() {
+        return LASTUPDATETIMESTAMP;
+    }
+
+    public void setLASTUPDATETIMESTAMP(Date LASTUPDATETIMESTAMP) {
+        this.LASTUPDATETIMESTAMP = LASTUPDATETIMESTAMP;
+    }
+
+    public void setDRAWRULEID(String DRAWRULEID)
+    {
+        this.DRAWRULEID = DRAWRULEID;
+    }
+
+    public Date getDAILYSTARTTIME() {
+        return DAILYSTARTTIME;
+    }
+
+    public void setDAILYSTARTTIME(Date DAILYSTARTTIME) {
+        this.DAILYSTARTTIME = DAILYSTARTTIME;
+    }
+
+    public Date getDAILYENDTIME() {
+        return DAILYENDTIME;
+    }
+
+    public void setDAILYENDTIME(Date DAILYENDTIME) {
+        this.DAILYENDTIME = DAILYENDTIME;
+    }
+
+    public String getDRAWRULEID()
+    {
+        return DRAWRULEID;
+    }
+
+
+    public void setFIRSTFLAG(String FIRSTFLAG)
+    {
+        this.FIRSTFLAG = FIRSTFLAG;
+    }
+
+    public String getFIRSTFLAG()
+    {
+        return FIRSTFLAG;
+    }
+    public void setFIRSTAWARDPRIZE(String FIRSTAWARDPRIZE)
+    {
+        this.FIRSTAWARDPRIZE = FIRSTAWARDPRIZE;
+    }
+
+    public String getFIRSTAWARDPRIZE()
+    {
+        return FIRSTAWARDPRIZE;
+    }
+    public void setDAILYFLAG(String DAILYFLAG)
+    {
+        this.DAILYFLAG = DAILYFLAG;
+    }
+
+    public String getDAILYFLAG()
+    {
+        return DAILYFLAG;
+    }
+
+
+    public void setDAILYNUMBER(Long DAILYNUMBER)
+    {
+        this.DAILYNUMBER = DAILYNUMBER;
+    }
+
+    public Long getDAILYNUMBER()
+    {
+        return DAILYNUMBER;
+    }
+    public void setWILLDRAWFLAG(String WILLDRAWFLAG)
+    {
+        this.WILLDRAWFLAG = WILLDRAWFLAG;
+    }
+
+    public String getWILLDRAWFLAG()
+    {
+        return WILLDRAWFLAG;
+    }
+    public void setWILLDRAWAWARDPRIZE(String WILLDRAWAWARDPRIZE)
+    {
+        this.WILLDRAWAWARDPRIZE = WILLDRAWAWARDPRIZE;
+    }
+
+    public String getWILLDRAWAWARDPRIZE()
+    {
+        return WILLDRAWAWARDPRIZE;
+    }
+
+
+    public void setWILLDRAWAWARDNUMBER(Long WILLDRAWAWARDNUMBER)
+    {
+        this.WILLDRAWAWARDNUMBER = WILLDRAWAWARDNUMBER;
+    }
+
+    public Long getWILLDRAWAWARDNUMBER()
+    {
+        return WILLDRAWAWARDNUMBER;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("DRAWRULEID", getDRAWRULEID())
+                .append("FIRSTFLAG", getFIRSTFLAG())
+                .append("FIRSTAWARDPRIZE", getFIRSTAWARDPRIZE())
+                .append("DAILYFLAG", getDAILYFLAG())
+                .append("DAILYSTARTTIME", getDAILYSTARTTIME())
+                .append("DAILYENDTIME", getDAILYENDTIME())
+                .append("DAILYNUMBER", getDAILYNUMBER())
+                .append("WILLDRAWFLAG", getWILLDRAWFLAG())
+                .append("WILLDRAWAWARDPRIZE", getWILLDRAWAWARDPRIZE())
+                .append("WILLDRAWAWARDNUMBER", getWILLDRAWAWARDNUMBER())
+                .toString();
+    }
+}
\ No newline at end of file
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawConfigMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawConfigMapper.java
new file mode 100644
index 000000000..2b93a3e07
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawConfigMapper.java
@@ -0,0 +1,62 @@
+package com.sinosoft.activity.mapper;
+
+import com.sinosoft.activity.domain.DrawConfig;
+
+import java.util.List;
+
+/**
+ * 存储奖项配置信息对象Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface DrawConfigMapper 
+{
+    /**
+     * 查询存储奖项配置信息对象
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息对象ID
+     * @return 存储奖项配置信息对象
+     */
+    public DrawConfig selectDrawConfigById(String DRAWCONFIGID);
+
+    /**
+     * 查询存储奖项配置信息对象列表
+     * 
+     * @param drawConfig 存储奖项配置信息对象
+     * @return 存储奖项配置信息对象集合
+     */
+    public List<DrawConfig> selectDrawConfigList(DrawConfig drawConfig);
+
+    /**
+     * 新增存储奖项配置信息对象
+     * 
+     * @param drawConfig 存储奖项配置信息对象
+     * @return 结果
+     */
+    public int insertDrawConfig(DrawConfig drawConfig);
+
+    /**
+     * 修改存储奖项配置信息对象
+     * 
+     * @param drawConfig 存储奖项配置信息对象
+     * @return 结果
+     */
+    public int updateDrawConfig(DrawConfig drawConfig);
+
+    /**
+     * 删除存储奖项配置信息对象
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息对象ID
+     * @return 结果
+     */
+    public int deleteDrawConfigById(String DRAWCONFIGID);
+
+    /**
+     * 批量删除存储奖项配置信息对象
+     * 
+     * @param DRAWCONFIGIDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawConfigByIds(String[] DRAWCONFIGIDs);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
new file mode 100644
index 000000000..3962dd31a
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
@@ -0,0 +1,63 @@
+package com.sinosoft.activity.mapper;
+
+
+import com.sinosoft.activity.domain.DrawInfo;
+
+import java.util.List;
+
+/**
+ * 抽奖活动管理对象Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface DrawInfoMapper 
+{
+    /**
+     * 查询抽奖活动管理对象
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 抽奖活动管理对象
+     */
+    public DrawInfo selectDrawInfoById(String DRAWID);
+
+    /**
+     * 查询抽奖活动管理对象列表
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 抽奖活动管理对象集合
+     */
+    public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
+
+    /**
+     * 新增抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    public int insertDrawInfo(DrawInfo drawInfo);
+
+    /**
+     * 修改抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    public int updateDrawInfo(DrawInfo drawInfo);
+
+    /**
+     * 删除抽奖活动管理对象
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 结果
+     */
+    public int deleteDrawInfoById(String DRAWID);
+
+    /**
+     * 批量删除抽奖活动管理对象
+     * 
+     * @param DRAWIDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawInfoByIds(String[] DRAWIDs);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
new file mode 100644
index 000000000..00aedc5d5
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
@@ -0,0 +1,62 @@
+package com.sinosoft.activity.mapper;
+
+import java.util.List;
+
+import com.sinosoft.activity.domain.DrawRule;
+
+/**
+ * 查询抽奖活动管理对象Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface DrawRuleMapper 
+{
+    /**
+     * 查询查询抽奖活动管理对象
+     * 
+     * @param DRAWRULEID 查询抽奖活动管理对象ID
+     * @return 查询抽奖活动管理对象
+     */
+    public DrawRule selectDrawRuleById(String DRAWRULEID);
+
+    /**
+     * 查询查询抽奖活动管理对象列表
+     * 
+     * @param drawRule 查询抽奖活动管理对象
+     * @return 查询抽奖活动管理对象集合
+     */
+    public List<DrawRule> selectDrawRuleList(DrawRule drawRule);
+
+    /**
+     * 新增查询抽奖活动管理对象
+     * 
+     * @param drawRule 查询抽奖活动管理对象
+     * @return 结果
+     */
+    public int insertDrawRule(DrawRule drawRule);
+
+    /**
+     * 修改查询抽奖活动管理对象
+     * 
+     * @param drawRule 查询抽奖活动管理对象
+     * @return 结果
+     */
+    public int updateDrawRule(DrawRule drawRule);
+
+    /**
+     * 删除查询抽奖活动管理对象
+     * 
+     * @param DRAWRULEID 查询抽奖活动管理对象ID
+     * @return 结果
+     */
+    public int deleteDrawRuleById(String DRAWRULEID);
+
+    /**
+     * 批量删除查询抽奖活动管理对象
+     * 
+     * @param DRAWRULEIDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawRuleByIds(String[] DRAWRULEIDs);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
new file mode 100644
index 000000000..92ff87575
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
@@ -0,0 +1,62 @@
+package com.sinosoft.activity.service;
+
+import java.util.List;
+
+import com.sinosoft.activity.domain.DrawConfig;
+
+/**
+ * 存储奖项配置信息列表Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface IDrawConfigService 
+{
+    /**
+     * 查询存储奖项配置信息列表
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息列表ID
+     * @return 存储奖项配置信息列表
+     */
+    public DrawConfig selectDrawConfigById(String DRAWCONFIGID);
+
+    /**
+     * 查询存储奖项配置信息列表列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 存储奖项配置信息列表集合
+     */
+    public List<DrawConfig> selectDrawConfigList(DrawConfig drawConfig);
+
+    /**
+     * 新增存储奖项配置信息列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 结果
+     */
+    public int insertDrawConfig(DrawConfig drawConfig);
+
+    /**
+     * 修改存储奖项配置信息列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 结果
+     */
+    public int updateDrawConfig(DrawConfig drawConfig);
+
+    /**
+     * 批量删除存储奖项配置信息列表
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawConfigByIds(String ids);
+
+    /**
+     * 删除存储奖项配置信息列表信息
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息列表ID
+     * @return 结果
+     */
+    public int deleteDrawConfigById(String DRAWCONFIGID);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
new file mode 100644
index 000000000..51e61d5c8
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -0,0 +1,63 @@
+package com.sinosoft.activity.service;
+
+
+import com.sinosoft.activity.domain.DrawInfo;
+
+import java.util.List;
+
+/**
+ * 抽奖活动管理对象Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface IDrawInfoService 
+{
+    /**
+     * 查询抽奖活动管理对象
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 抽奖活动管理对象
+     */
+    public DrawInfo selectDrawInfoById(String DRAWID);
+
+    /**
+     * 查询抽奖活动管理对象列表
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 抽奖活动管理对象集合
+     */
+    public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
+
+    /**
+     * 新增抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    public int insertDrawInfo(DrawInfo drawInfo);
+
+    /**
+     * 修改抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    public int updateDrawInfo(DrawInfo drawInfo);
+
+    /**
+     * 批量删除抽奖活动管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawInfoByIds(String ids);
+
+    /**
+     * 删除抽奖活动管理对象信息
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 结果
+     */
+    public int deleteDrawInfoById(String DRAWID);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java
new file mode 100644
index 000000000..b11dbfd57
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java
@@ -0,0 +1,63 @@
+package com.sinosoft.activity.service;
+
+
+import com.sinosoft.activity.domain.DrawRule;
+
+import java.util.List;
+
+/**
+ * 存储抽奖特殊规则对象Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+public interface IDrawRuleService 
+{
+    /**
+     * 查询存储抽奖特殊规则对象
+     * 
+     * @param DRAWRULEID 存储抽奖特殊规则对象ID
+     * @return 存储抽奖特殊规则对象
+     */
+    public DrawRule selectDrawRuleById(String DRAWRULEID);
+
+    /**
+     * 查询存储抽奖特殊规则对象列表
+     * 
+     * @param drawRule 存储抽奖特殊规则对象
+     * @return 存储抽奖特殊规则对象集合
+     */
+    public List<DrawRule> selectDrawRuleList(DrawRule drawRule);
+
+    /**
+     * 新增存储抽奖特殊规则对象
+     * 
+     * @param drawRule 存储抽奖特殊规则对象
+     * @return 结果
+     */
+    public int insertDrawRule(DrawRule drawRule);
+
+    /**
+     * 修改存储抽奖特殊规则对象
+     * 
+     * @param drawRule 存储抽奖特殊规则对象
+     * @return 结果
+     */
+    public int updateDrawRule(DrawRule drawRule);
+
+    /**
+     * 批量删除存储抽奖特殊规则对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDrawRuleByIds(String ids);
+
+    /**
+     * 删除存储抽奖特殊规则对象信息
+     * 
+     * @param DRAWRULEID 存储抽奖特殊规则对象ID
+     * @return 结果
+     */
+    public int deleteDrawRuleById(String DRAWRULEID);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
new file mode 100644
index 000000000..68d27bb9c
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
@@ -0,0 +1,96 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+
+import com.sinosoft.activity.domain.DrawConfig;
+import com.sinosoft.activity.mapper.DrawConfigMapper;
+import com.sinosoft.activity.service.IDrawConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 存储奖项配置信息列表Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+@Service
+public class DrawConfigServiceImpl implements IDrawConfigService
+{
+    @Autowired
+    private DrawConfigMapper drawConfigMapper;
+
+    /**
+     * 查询存储奖项配置信息列表
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息列表ID
+     * @return 存储奖项配置信息列表
+     */
+    @Override
+    public DrawConfig selectDrawConfigById(String DRAWCONFIGID)
+    {
+        return drawConfigMapper.selectDrawConfigById(DRAWCONFIGID);
+    }
+
+    /**
+     * 查询存储奖项配置信息列表列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 存储奖项配置信息列表
+     */
+    @Override
+    public List<DrawConfig> selectDrawConfigList(DrawConfig drawConfig)
+    {
+        return drawConfigMapper.selectDrawConfigList(drawConfig);
+    }
+
+    /**
+     * 新增存储奖项配置信息列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 结果
+     */
+    @Override
+    public int insertDrawConfig(DrawConfig drawConfig)
+    {
+        return drawConfigMapper.insertDrawConfig(drawConfig);
+    }
+
+    /**
+     * 修改存储奖项配置信息列表
+     * 
+     * @param drawConfig 存储奖项配置信息列表
+     * @return 结果
+     */
+    @Override
+    public int updateDrawConfig(DrawConfig drawConfig)
+    {
+        return drawConfigMapper.updateDrawConfig(drawConfig);
+    }
+
+    /**
+     * 删除存储奖项配置信息列表对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawConfigByIds(String ids)
+    {
+        return drawConfigMapper.deleteDrawConfigByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除存储奖项配置信息列表信息
+     * 
+     * @param DRAWCONFIGID 存储奖项配置信息列表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawConfigById(String DRAWCONFIGID)
+    {
+        return drawConfigMapper.deleteDrawConfigById(DRAWCONFIGID);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
new file mode 100644
index 000000000..b258db019
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -0,0 +1,96 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+
+import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.mapper.DrawInfoMapper;
+import com.sinosoft.activity.service.IDrawInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 抽奖活动管理对象Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+@Service
+public class DrawInfoServiceImpl implements IDrawInfoService
+{
+    @Autowired
+    private DrawInfoMapper drawInfoMapper;
+
+    /**
+     * 查询抽奖活动管理对象
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 抽奖活动管理对象
+     */
+    @Override
+    public DrawInfo selectDrawInfoById(String DRAWID)
+    {
+        return drawInfoMapper.selectDrawInfoById(DRAWID);
+    }
+
+    /**
+     * 查询抽奖活动管理对象列表
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 抽奖活动管理对象
+     */
+    @Override
+    public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo)
+    {
+        return drawInfoMapper.selectDrawInfoList(drawInfo);
+    }
+
+    /**
+     * 新增抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    @Override
+    public int insertDrawInfo(DrawInfo drawInfo)
+    {
+        return drawInfoMapper.insertDrawInfo(drawInfo);
+    }
+
+    /**
+     * 修改抽奖活动管理对象
+     * 
+     * @param drawInfo 抽奖活动管理对象
+     * @return 结果
+     */
+    @Override
+    public int updateDrawInfo(DrawInfo drawInfo)
+    {
+        return drawInfoMapper.updateDrawInfo(drawInfo);
+    }
+
+    /**
+     * 删除抽奖活动管理对象对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawInfoByIds(String ids)
+    {
+        return drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除抽奖活动管理对象信息
+     * 
+     * @param DRAWID 抽奖活动管理对象ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawInfoById(String DRAWID)
+    {
+        return drawInfoMapper.deleteDrawInfoById(DRAWID);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java
new file mode 100644
index 000000000..b612191a0
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java
@@ -0,0 +1,96 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+
+import com.sinosoft.activity.domain.DrawRule;
+import com.sinosoft.activity.mapper.DrawRuleMapper;
+import com.sinosoft.activity.service.IDrawRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 抽奖活动管理对象Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-25
+ */
+@Service
+public class DrawRuleServiceImpl implements IDrawRuleService
+{
+    @Autowired
+    private DrawRuleMapper drawRuleMapper;
+
+    /**
+     * 查询抽奖活动管理对象
+     * 
+     * @param DRAWRULEID 抽奖活动管理对象ID
+     * @return 抽奖活动管理对象
+     */
+    @Override
+    public DrawRule selectDrawRuleById(String DRAWRULEID)
+    {
+        return drawRuleMapper.selectDrawRuleById(DRAWRULEID);
+    }
+
+    /**
+     * 查询抽奖活动管理对象列表
+     * 
+     * @param drawRule 抽奖活动管理对象
+     * @return 抽奖活动管理对象
+     */
+    @Override
+    public List<DrawRule> selectDrawRuleList(DrawRule drawRule)
+    {
+        return drawRuleMapper.selectDrawRuleList(drawRule);
+    }
+
+    /**
+     * 新增抽奖活动管理对象
+     * 
+     * @param drawRule 抽奖活动管理对象
+     * @return 结果
+     */
+    @Override
+    public int insertDrawRule(DrawRule drawRule)
+    {
+        return drawRuleMapper.insertDrawRule(drawRule);
+    }
+
+    /**
+     * 修改抽奖活动管理对象
+     * 
+     * @param drawRule 抽奖活动管理对象
+     * @return 结果
+     */
+    @Override
+    public int updateDrawRule(DrawRule drawRule)
+    {
+        return drawRuleMapper.updateDrawRule(drawRule);
+    }
+
+    /**
+     * 删除抽奖活动管理对象对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawRuleByIds(String ids)
+    {
+        return drawRuleMapper.deleteDrawRuleByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除抽奖活动管理对象信息
+     * 
+     * @param DRAWRULEID 抽奖活动管理对象ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDrawRuleById(String DRAWRULEID)
+    {
+        return drawRuleMapper.deleteDrawRuleById(DRAWRULEID);
+    }
+}
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawConfigMapper.xml
new file mode 100644
index 000000000..1a9744495
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/DrawConfigMapper.xml
@@ -0,0 +1,157 @@
+<?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.sinosoft.activity.mapper.DrawConfigMapper">
+    
+    <resultMap type="DrawConfig" id="DrawConfigResult">
+        <result property="DRAWCONFIGID"    column="DRAWCONFIGID"    />
+        <result property="PRIZECODE"    column="PRIZECODE"    />
+        <result property="DRAWCODE"    column="DRAWCODE"    />
+        <result property="PROBABILITY"    column="PROBABILITY"    />
+        <result property="DISPLAYORDER"    column="DISPLAYORDER"    />
+        <result property="PRIZELEVEL"    column="PRIZELEVEL"    />
+        <result property="CUE"    column="CUE"    />
+        <result property="TOTALNUMBER"    column="TOTALNUMBER"    />
+        <result property="AVAILABLENUMBER"    column="AVAILABLENUMBER"    />
+        <result property="STATUS"    column="STATUS"    />
+        <result property="CREATETIMESTAMP"    column="CREATETIMESTAMP"    />
+        <result property="LASTUPDATETIMESTAMP"    column="LASTUPDATETIMESTAMP"    />
+        <result property="AWARDTYPE"    column="AWARDTYPE"    />
+        <result property="AWARDTYPEVALUE"    column="AWARDTYPEVALUE"    />
+        <result property="AWARDMETHOD"    column="AWARDMETHOD"    />
+        <result property="SENDMSGFLAG"    column="SENDMSGFLAG"    />
+        <result property="MSGTEMPLETEID"    column="MSGTEMPLETEID"    />
+        <result property="PRIZENAME"    column="PRIZENAME"    />
+    </resultMap>
+
+    <sql id="selectDrawConfigVo">
+        select DRAWCONFIGID, PRIZECODE, DRAWCODE, PROBABILITY, DISPLAYORDER, PRIZELEVEL, CUE, TOTALNUMBER, AVAILABLENUMBER, STATUS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, AWARDTYPE, AWARDTYPEVALUE, AWARDMETHOD, SENDMSGFLAG, MSGTEMPLETEID from draw_config
+    </sql>
+
+    <select id="selectDrawConfigList" parameterType="DrawConfig" resultMap="DrawConfigResult">
+        SELECT
+        c.DRAWCONFIGID,
+        c.PRIZECODE,
+        c.DRAWCODE,
+        c.PROBABILITY,
+        c.DISPLAYORDER,
+        c.PRIZELEVEL,
+        c.CUE,
+        c.TOTALNUMBER,
+        c.AVAILABLENUMBER,
+        c.STATUS,
+        c.CREATETIMESTAMP,
+        c.LASTUPDATETIMESTAMP,
+        c.AWARDTYPE,
+        c.AWARDTYPEVALUE,
+        c.AWARDMETHOD,
+        c.SENDMSGFLAG,
+        c.MSGTEMPLETEID,
+        p.PRIZENAME
+        FROM
+        draw_config c
+        LEFT JOIN draw_prize_info p on  c.PRIZECODE=p.PRIZECODE
+        <where>
+            <if test="PRIZECODE != null  and PRIZECODE != ''"> and PRIZECODE = #{PRIZECODE}</if>
+            <if test="DRAWCODE != null  and DRAWCODE != ''"> and DRAWCODE = #{DRAWCODE}</if>
+            <if test="PROBABILITY != null  and PROBABILITY != ''"> and PROBABILITY = #{PROBABILITY}</if>
+            <if test="DISPLAYORDER != null  and DISPLAYORDER != ''"> and DISPLAYORDER = #{DISPLAYORDER}</if>
+            <if test="PRIZELEVEL != null  and PRIZELEVEL != ''"> and PRIZELEVEL = #{PRIZELEVEL}</if>
+            <if test="CUE != null  and CUE != ''"> and CUE = #{CUE}</if>
+            <if test="TOTALNUMBER != null "> and TOTALNUMBER = #{TOTALNUMBER}</if>
+            <if test="AVAILABLENUMBER != null "> and AVAILABLENUMBER = #{AVAILABLENUMBER}</if>
+            <if test="STATUS != null  and STATUS != ''"> and STATUS = #{STATUS}</if>
+            <if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
+            <if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
+            <if test="AWARDTYPE != null  and AWARDTYPE != ''"> and AWARDTYPE = #{AWARDTYPE}</if>
+            <if test="AWARDTYPEVALUE != null "> and AWARDTYPEVALUE = #{AWARDTYPEVALUE}</if>
+            <if test="AWARDMETHOD != null  and AWARDMETHOD != ''"> and AWARDMETHOD = #{AWARDMETHOD}</if>
+            <if test="SENDMSGFLAG != null  and SENDMSGFLAG != ''"> and SENDMSGFLAG = #{SENDMSGFLAG}</if>
+            <if test="MSGTEMPLETEID != null  and MSGTEMPLETEID != ''"> and MSGTEMPLETEID = #{MSGTEMPLETEID}</if>
+        </where>
+        ORDER BY     c.DISPLAYORDER
+    </select>
+    
+    <select id="selectDrawConfigById" parameterType="String" resultMap="DrawConfigResult">
+        <include refid="selectDrawConfigVo"/>
+        where DRAWCONFIGID = #{DRAWCONFIGID}
+    </select>
+        
+    <insert id="insertDrawConfig" parameterType="DrawConfig">
+        insert into draw_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="DRAWCONFIGID != null">DRAWCONFIGID,</if>
+            <if test="PRIZECODE != null">PRIZECODE,</if>
+            <if test="DRAWCODE != null">DRAWCODE,</if>
+            <if test="PROBABILITY != null">PROBABILITY,</if>
+            <if test="DISPLAYORDER != null">DISPLAYORDER,</if>
+            <if test="PRIZELEVEL != null">PRIZELEVEL,</if>
+            <if test="CUE != null">CUE,</if>
+            <if test="TOTALNUMBER != null">TOTALNUMBER,</if>
+            <if test="AVAILABLENUMBER != null">AVAILABLENUMBER,</if>
+            <if test="STATUS != null">STATUS,</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
+            <if test="AWARDTYPE != null">AWARDTYPE,</if>
+            <if test="AWARDTYPEVALUE != null">AWARDTYPEVALUE,</if>
+            <if test="AWARDMETHOD != null">AWARDMETHOD,</if>
+            <if test="SENDMSGFLAG != null">SENDMSGFLAG,</if>
+            <if test="MSGTEMPLETEID != null">MSGTEMPLETEID,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="DRAWCONFIGID != null">#{DRAWCONFIGID},</if>
+            <if test="PRIZECODE != null">#{PRIZECODE},</if>
+            <if test="DRAWCODE != null">#{DRAWCODE},</if>
+            <if test="PROBABILITY != null">#{PROBABILITY},</if>
+            <if test="DISPLAYORDER != null">#{DISPLAYORDER},</if>
+            <if test="PRIZELEVEL != null">#{PRIZELEVEL},</if>
+            <if test="CUE != null">#{CUE},</if>
+            <if test="TOTALNUMBER != null">#{TOTALNUMBER},</if>
+            <if test="AVAILABLENUMBER != null">#{AVAILABLENUMBER},</if>
+            <if test="STATUS != null">#{STATUS},</if>
+            <if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
+            <if test="AWARDTYPE != null">#{AWARDTYPE},</if>
+            <if test="AWARDTYPEVALUE != null">#{AWARDTYPEVALUE},</if>
+            <if test="AWARDMETHOD != null">#{AWARDMETHOD},</if>
+            <if test="SENDMSGFLAG != null">#{SENDMSGFLAG},</if>
+            <if test="MSGTEMPLETEID != null">#{MSGTEMPLETEID},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDrawConfig" parameterType="DrawConfig">
+        update draw_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="PRIZECODE != null">PRIZECODE = #{PRIZECODE},</if>
+            <if test="DRAWCODE != null">DRAWCODE = #{DRAWCODE},</if>
+            <if test="PROBABILITY != null">PROBABILITY = #{PROBABILITY},</if>
+            <if test="DISPLAYORDER != null">DISPLAYORDER = #{DISPLAYORDER},</if>
+            <if test="PRIZELEVEL != null">PRIZELEVEL = #{PRIZELEVEL},</if>
+            <if test="CUE != null">CUE = #{CUE},</if>
+            <if test="TOTALNUMBER != null">TOTALNUMBER = #{TOTALNUMBER},</if>
+            <if test="AVAILABLENUMBER != null">AVAILABLENUMBER = #{AVAILABLENUMBER},</if>
+            <if test="STATUS != null">STATUS = #{STATUS},</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
+            <if test="AWARDTYPE != null">AWARDTYPE = #{AWARDTYPE},</if>
+            <if test="AWARDTYPEVALUE != null">AWARDTYPEVALUE = #{AWARDTYPEVALUE},</if>
+            <if test="AWARDMETHOD != null">AWARDMETHOD = #{AWARDMETHOD},</if>
+            <if test="SENDMSGFLAG != null">SENDMSGFLAG = #{SENDMSGFLAG},</if>
+            <if test="MSGTEMPLETEID != null">MSGTEMPLETEID = #{MSGTEMPLETEID},</if>
+        </trim>
+        where DRAWCONFIGID = #{DRAWCONFIGID}
+    </update>
+
+    <delete id="deleteDrawConfigById" parameterType="String">
+        delete from draw_config where DRAWCONFIGID = #{DRAWCONFIGID}
+    </delete>
+
+    <delete id="deleteDrawConfigByIds" parameterType="String">
+        delete from draw_config where DRAWCONFIGID in 
+        <foreach item="DRAWCONFIGID" collection="array" open="(" separator="," close=")">
+            #{DRAWCONFIGID}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
new file mode 100644
index 000000000..d67c7da8f
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
@@ -0,0 +1,156 @@
+<?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.sinosoft.activity.mapper.DrawInfoMapper">
+    
+    <resultMap type="DrawInfo" id="DrawInfoResult">
+        <result property="DRAWID"    column="DRAWID"    />
+        <result property="DRAWCODE"    column="DRAWCODE"    />
+        <result property="DRAWTYPE"    column="DRAWTYPE"    />
+        <result property="DRAWNAME"    column="DRAWNAME"    />
+        <result property="STARTTIME"    column="STARTTIME"    />
+        <result property="ENDTIME"    column="ENDTIME"    />
+        <result property="EXPENO"    column="EXPENO"    />
+        <result property="EXPENOVALUE"    column="EXPENOVALUE"    />
+        <result property="COMMENTS"    column="COMMENTS"    />
+        <result property="CREATETIMESTAMP"    column="CREATETIMESTAMP"    />
+        <result property="LASTUPDATETIMESTAMP"    column="LASTUPDATETIMESTAMP"    />
+        <result property="STATUS"    column="STATUS"    />
+        <result property="UPDATEFLAG"    column="UPDATEFLAG"    />
+        <result property="RULEDESCRIPTION"    column="RULEDESCRIPTION"    />
+        <result property="VALIDATETYPE"    column="VALIDATETYPE"    />
+
+        <result property="DRAWRULEID"    column="DRAWRULEID"    />
+        <result property="FIRSTFLAG"    column="FIRSTFLAG"    />
+        <result property="FIRSTAWARDPRIZE"    column="FIRSTAWARDPRIZE"    />
+        <result property="DAILYFLAG"    column="DAILYFLAG"    />
+        <result property="DAILYSTARTTIME"    column="DAILYSTARTTIME"    />
+        <result property="DAILYENDTIME"    column="DAILYENDTIME"    />
+        <result property="DAILYNUMBER"    column="DAILYNUMBER"    />
+        <result property="WILLDRAWFLAG"    column="WILLDRAWFLAG"    />
+        <result property="WILLDRAWAWARDPRIZE"    column="WILLDRAWAWARDPRIZE"    />
+        <result property="WILLDRAWAWARDNUMBER"    column="WILLDRAWAWARDNUMBER"    />
+    </resultMap>
+
+    <sql id="selectDrawInfoVo">
+        select DRAWID, DRAWCODE, DRAWTYPE, DRAWNAME, STARTTIME, ENDTIME, EXPENO, EXPENOVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, UPDATEFLAG, RULEDESCRIPTION, VALIDATETYPE from draw_info
+    </sql>
+
+    <select id="selectDrawInfoList" parameterType="DrawInfo" resultMap="DrawInfoResult">
+        <include refid="selectDrawInfoVo"/>
+        <where>  
+            <if test="DRAWCODE != null  and DRAWCODE != ''"> and DRAWCODE = #{DRAWCODE}</if>
+            <if test="DRAWTYPE != null  and DRAWTYPE != ''"> and DRAWTYPE = #{DRAWTYPE}</if>
+            <if test="DRAWNAME != null  and DRAWNAME != ''"> and DRAWNAME like concat('%', #{DRAWNAME}, '%')</if>
+            <if test="STARTTIME != null "> and STARTTIME = #{STARTTIME}</if>
+            <if test="ENDTIME != null "> and ENDTIME = #{ENDTIME}</if>
+            <if test="EXPENO != null  and EXPENO != ''"> and EXPENO = #{EXPENO}</if>
+            <if test="EXPENOVALUE != null "> and EXPENOVALUE = #{EXPENOVALUE}</if>
+            <if test="COMMENTS != null  and COMMENTS != ''"> and COMMENTS = #{COMMENTS}</if>
+            <if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
+            <if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
+            <if test="STATUS != null  and STATUS != ''"> and STATUS = #{STATUS}</if>
+            <if test="UPDATEFLAG != null  and UPDATEFLAG != ''"> and UPDATEFLAG = #{UPDATEFLAG}</if>
+            <if test="RULEDESCRIPTION != null  and RULEDESCRIPTION != ''"> and RULEDESCRIPTION = #{RULEDESCRIPTION}</if>
+            <if test="VALIDATETYPE != null  and VALIDATETYPE != ''"> and VALIDATETYPE = #{VALIDATETYPE}</if>
+        </where>
+    </select>
+    
+    <select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult">
+SELECT
+	i.DRAWID,
+	i.DRAWNAME,
+	i. STATUS,
+	i.EXPENO,
+	i.EXPENOVALUE,
+	i.STARTTIME,
+	i.ENDTIME,
+	r.FIRSTFLAG,
+	r.FIRSTAWARDPRIZE,
+	r.DAILYFLAG,
+	r.DAILYNUMBER,
+	r.DAILYSTARTTIME,
+	r.DAILYENDTIME,
+	r.WILLDRAWFLAG,
+	r.WILLDRAWAWARDNUMBER,
+	r.WILLDRAWAWARDPRIZE,
+	r.DRAWRULEID
+    FROM
+	draw_info i
+    LEFT JOIN draw_rule r ON i.DRAWCODE = r.DRAWCODE
+    WHERE
+    DRAWID = #{DRAWID}
+    </select>
+        
+    <insert id="insertDrawInfo" parameterType="DrawInfo">
+        insert into draw_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="DRAWID != null">DRAWID,</if>
+            <if test="DRAWCODE != null">DRAWCODE,</if>
+            <if test="DRAWTYPE != null">DRAWTYPE,</if>
+            <if test="DRAWNAME != null">DRAWNAME,</if>
+            <if test="STARTTIME != null">STARTTIME,</if>
+            <if test="ENDTIME != null">ENDTIME,</if>
+            <if test="EXPENO != null">EXPENO,</if>
+            <if test="EXPENOVALUE != null">EXPENOVALUE,</if>
+            <if test="COMMENTS != null">COMMENTS,</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
+            <if test="STATUS != null">STATUS,</if>
+            <if test="UPDATEFLAG != null">UPDATEFLAG,</if>
+            <if test="RULEDESCRIPTION != null">RULEDESCRIPTION,</if>
+            <if test="VALIDATETYPE != null">VALIDATETYPE,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="DRAWID != null">#{DRAWID},</if>
+            <if test="DRAWCODE != null">#{DRAWCODE},</if>
+            <if test="DRAWTYPE != null">#{DRAWTYPE},</if>
+            <if test="DRAWNAME != null">#{DRAWNAME},</if>
+            <if test="STARTTIME != null">#{STARTTIME},</if>
+            <if test="ENDTIME != null">#{ENDTIME},</if>
+            <if test="EXPENO != null">#{EXPENO},</if>
+            <if test="EXPENOVALUE != null">#{EXPENOVALUE},</if>
+            <if test="COMMENTS != null">#{COMMENTS},</if>
+            <if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
+            <if test="STATUS != null">#{STATUS},</if>
+            <if test="UPDATEFLAG != null">#{UPDATEFLAG},</if>
+            <if test="RULEDESCRIPTION != null">#{RULEDESCRIPTION},</if>
+            <if test="VALIDATETYPE != null">#{VALIDATETYPE},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDrawInfo" parameterType="DrawInfo">
+        update draw_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="DRAWCODE != null">DRAWCODE = #{DRAWCODE},</if>
+            <if test="DRAWTYPE != null">DRAWTYPE = #{DRAWTYPE},</if>
+            <if test="DRAWNAME != null">DRAWNAME = #{DRAWNAME},</if>
+            <if test="STARTTIME != null">STARTTIME = #{STARTTIME},</if>
+            <if test="ENDTIME != null">ENDTIME = #{ENDTIME},</if>
+            <if test="EXPENO != null">EXPENO = #{EXPENO},</if>
+            <if test="EXPENOVALUE != null">EXPENOVALUE = #{EXPENOVALUE},</if>
+            <if test="COMMENTS != null">COMMENTS = #{COMMENTS},</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
+            <if test="STATUS != null">STATUS = #{STATUS},</if>
+            <if test="UPDATEFLAG != null">UPDATEFLAG = #{UPDATEFLAG},</if>
+            <if test="RULEDESCRIPTION != null">RULEDESCRIPTION = #{RULEDESCRIPTION},</if>
+            <if test="VALIDATETYPE != null">VALIDATETYPE = #{VALIDATETYPE},</if>
+        </trim>
+        where DRAWID = #{DRAWID}
+    </update>
+
+    <delete id="deleteDrawInfoById" parameterType="String">
+        delete from draw_info where DRAWID = #{DRAWID}
+    </delete>
+
+    <delete id="deleteDrawInfoByIds" parameterType="String">
+        delete from draw_info where DRAWID in 
+        <foreach item="DRAWID" collection="array" open="(" separator="," close=")">
+            #{DRAWID}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
new file mode 100644
index 000000000..91fc9def8
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
@@ -0,0 +1,114 @@
+<?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.sinosoft.activity.mapper.DrawRuleMapper">
+    
+    <resultMap type="DrawRule" id="DrawRuleResult">
+        <result property="DRAWRULEID"    column="DRAWRULEID"    />
+        <result property="DRAWCODE"    column="DRAWCODE"    />
+        <result property="FIRSTFLAG"    column="FIRSTFLAG"    />
+        <result property="FIRSTAWARDPRIZE"    column="FIRSTAWARDPRIZE"    />
+        <result property="DAILYFLAG"    column="DAILYFLAG"    />
+        <result property="DAILYSTARTTIME"    column="DAILYSTARTTIME"    />
+        <result property="DAILYENDTIME"    column="DAILYENDTIME"    />
+        <result property="DAILYNUMBER"    column="DAILYNUMBER"    />
+        <result property="WILLDRAWFLAG"    column="WILLDRAWFLAG"    />
+        <result property="WILLDRAWAWARDPRIZE"    column="WILLDRAWAWARDPRIZE"    />
+        <result property="CREATETIMESTAMP"    column="CREATETIMESTAMP"    />
+        <result property="LASTUPDATETIMESTAMP"    column="LASTUPDATETIMESTAMP"    />
+        <result property="WILLDRAWAWARDNUMBER"    column="WILLDRAWAWARDNUMBER"    />
+    </resultMap>
+
+    <sql id="selectDrawRuleVo">
+        select DRAWRULEID, DRAWCODE, FIRSTFLAG, FIRSTAWARDPRIZE, DAILYFLAG, DAILYSTARTTIME, DAILYENDTIME, DAILYNUMBER, WILLDRAWFLAG, WILLDRAWAWARDPRIZE, CREATETIMESTAMP, LASTUPDATETIMESTAMP, WILLDRAWAWARDNUMBER from draw_rule
+    </sql>
+
+    <select id="selectDrawRuleList" parameterType="DrawRule" resultMap="DrawRuleResult">
+        <include refid="selectDrawRuleVo"/>
+        <where>  
+            <if test="DRAWCODE != null  and DRAWCODE != ''"> and DRAWCODE = #{DRAWCODE}</if>
+            <if test="FIRSTFLAG != null  and FIRSTFLAG != ''"> and FIRSTFLAG = #{FIRSTFLAG}</if>
+            <if test="FIRSTAWARDPRIZE != null  and FIRSTAWARDPRIZE != ''"> and FIRSTAWARDPRIZE = #{FIRSTAWARDPRIZE}</if>
+            <if test="DAILYFLAG != null  and DAILYFLAG != ''"> and DAILYFLAG = #{DAILYFLAG}</if>
+            <if test="DAILYSTARTTIME != null  and DAILYSTARTTIME != ''"> and DAILYSTARTTIME = #{DAILYSTARTTIME}</if>
+            <if test="DAILYENDTIME != null  and DAILYENDTIME != ''"> and DAILYENDTIME = #{DAILYENDTIME}</if>
+            <if test="DAILYNUMBER != null "> and DAILYNUMBER = #{DAILYNUMBER}</if>
+            <if test="WILLDRAWFLAG != null  and WILLDRAWFLAG != ''"> and WILLDRAWFLAG = #{WILLDRAWFLAG}</if>
+            <if test="WILLDRAWAWARDPRIZE != null  and WILLDRAWAWARDPRIZE != ''"> and WILLDRAWAWARDPRIZE = #{WILLDRAWAWARDPRIZE}</if>
+            <if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
+            <if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
+            <if test="WILLDRAWAWARDNUMBER != null "> and WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER}</if>
+        </where>
+    </select>
+    
+    <select id="selectDrawRuleById" parameterType="String" resultMap="DrawRuleResult">
+        <include refid="selectDrawRuleVo"/>
+        where DRAWRULEID = #{DRAWRULEID}
+    </select>
+        
+    <insert id="insertDrawRule" parameterType="DrawRule">
+        insert into draw_rule
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="DRAWRULEID != null">DRAWRULEID,</if>
+            <if test="DRAWCODE != null and DRAWCODE != ''">DRAWCODE,</if>
+            <if test="FIRSTFLAG != null">FIRSTFLAG,</if>
+            <if test="FIRSTAWARDPRIZE != null">FIRSTAWARDPRIZE,</if>
+            <if test="DAILYFLAG != null">DAILYFLAG,</if>
+            <if test="DAILYSTARTTIME != null">DAILYSTARTTIME,</if>
+            <if test="DAILYENDTIME != null">DAILYENDTIME,</if>
+            <if test="DAILYNUMBER != null">DAILYNUMBER,</if>
+            <if test="WILLDRAWFLAG != null">WILLDRAWFLAG,</if>
+            <if test="WILLDRAWAWARDPRIZE != null">WILLDRAWAWARDPRIZE,</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
+            <if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="DRAWRULEID != null">#{DRAWRULEID},</if>
+            <if test="DRAWCODE != null and DRAWCODE != ''">#{DRAWCODE},</if>
+            <if test="FIRSTFLAG != null">#{FIRSTFLAG},</if>
+            <if test="FIRSTAWARDPRIZE != null">#{FIRSTAWARDPRIZE},</if>
+            <if test="DAILYFLAG != null">#{DAILYFLAG},</if>
+            <if test="DAILYSTARTTIME != null">#{DAILYSTARTTIME},</if>
+            <if test="DAILYENDTIME != null">#{DAILYENDTIME},</if>
+            <if test="DAILYNUMBER != null">#{DAILYNUMBER},</if>
+            <if test="WILLDRAWFLAG != null">#{WILLDRAWFLAG},</if>
+            <if test="WILLDRAWAWARDPRIZE != null">#{WILLDRAWAWARDPRIZE},</if>
+            <if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
+            <if test="WILLDRAWAWARDNUMBER != null">#{WILLDRAWAWARDNUMBER},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDrawRule" parameterType="DrawRule">
+        update draw_rule
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="DRAWCODE != null and DRAWCODE != ''">DRAWCODE = #{DRAWCODE},</if>
+            <if test="FIRSTFLAG != null">FIRSTFLAG = #{FIRSTFLAG},</if>
+            <if test="FIRSTAWARDPRIZE != null">FIRSTAWARDPRIZE = #{FIRSTAWARDPRIZE},</if>
+            <if test="DAILYFLAG != null">DAILYFLAG = #{DAILYFLAG},</if>
+            <if test="DAILYSTARTTIME != null">DAILYSTARTTIME = #{DAILYSTARTTIME},</if>
+            <if test="DAILYENDTIME != null">DAILYENDTIME = #{DAILYENDTIME},</if>
+            <if test="DAILYNUMBER != null">DAILYNUMBER = #{DAILYNUMBER},</if>
+            <if test="WILLDRAWFLAG != null">WILLDRAWFLAG = #{WILLDRAWFLAG},</if>
+            <if test="WILLDRAWAWARDPRIZE != null">WILLDRAWAWARDPRIZE = #{WILLDRAWAWARDPRIZE},</if>
+            <if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
+            <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
+            <if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER},</if>
+        </trim>
+        where DRAWRULEID = #{DRAWRULEID}
+    </update>
+
+    <delete id="deleteDrawRuleById" parameterType="String">
+        delete from draw_rule where DRAWRULEID = #{DRAWRULEID}
+    </delete>
+
+    <delete id="deleteDrawRuleByIds" parameterType="String">
+        delete from draw_rule where DRAWRULEID in 
+        <foreach item="DRAWRULEID" collection="array" open="(" separator="," close=")">
+            #{DRAWRULEID}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html
new file mode 100644
index 000000000..bb2402dd9
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -0,0 +1,243 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('创建活动')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-add">
+                <h4 class="form-header h4">活动管理</h4>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">活动名称：</label>
+                            <div class="col-sm-8">
+                                <input name="DRAWNAME" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">状态：</label>
+                            <div class="col-sm-8">
+                                <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">消耗对象：</label>
+                            <div class="col-sm-8">
+                                <select name="EXPENO" class="form-control" th:with="type=${@dict.getType('expeType')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">消耗价值：</label>
+                            <div class="col-sm-8">
+                                <input name="EXPENOVALUE" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">开始时间：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <input name="STARTTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">结束时间：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <input name="ENDTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+                <h4 class="form-header h4">活动规则</h4>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
+                        <div class="col-sm-8">
+                            <select name="FIRSTFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
+                        <div class="col-sm-8">
+                            <select name="FIRSTAWARDPRIZE" class="form-control" id="firstawardprize">
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">时间段抽奖配置：</label>
+                        <div class="col-sm-8">
+                            <select name="DAILYFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
+                        <div class="col-sm-8">
+                            <input name="DAILYNUMBER" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <input name="DAILYSTARTTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group date">
+                                <input name="DAILYENDTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">抽奖必中配置：</label>
+                        <div class="col-sm-8">
+                            <select name="WILLDRAWFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
+                        <div class="col-sm-8">
+                            <input name="WILLDRAWAWARDNUMBER" placeholder="抽奖必中计数" class="form-control" type="text" maxlength="30">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">抽奖必中奖品：</label>
+                        <div class="col-sm-8">
+                            <select name="WILLDRAWAWARDPRIZE" class="form-control" id="willdrawawardprize">
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "activity/info"
+
+        /**获取奖品及信息列表*/
+        $(document).ready(function() {
+            var job= "<option value=''>所有</option>";
+            $.ajax({
+
+                    url:prefix + "/prizeInfo",
+                    success: function (data) {
+
+                        for(var i in data){
+                            job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                        }
+                        $("#firstawardprize").html(job);
+                        $("#willdrawawardprize").html(job);
+                    },
+                    error : function(XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    },
+                    async:false             //false表示同步
+                }
+
+            );
+        });
+
+        $("#form-info-add").validate({
+            focusCleanup: true
+        });
+
+
+        function submitHandler(){
+            var data = $("#form-info-add").serializeArray();
+            $.operate.saveModal(prefix+"/add", data);
+        }
+
+
+        $("input[name='STARTTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='ENDTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='DAILYSTARTTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='DAILYENDTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/configAdd.html b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
new file mode 100644
index 000000000..7b1597330
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增存储奖项配置信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-add">
+        <input type="hidden" name="DRAWCODE" th:value="${DRAWCODE}"  />
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖项名称：</label>
+                    <div class="col-sm-8">
+                        <select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品名称：</label>
+                    <div class="col-sm-8">
+                        <select name="PRIZECODE" class="form-control" id="PRIZECODE">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">中奖概率：</label>
+                    <div class="col-sm-8">
+                        <input name="PROBABILITY" id="PROBABILITY" placeholder="中奖概率" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">展示顺序：</label>
+                    <div class="col-sm-8">
+                        <input name="DISPLAYORDER" placeholder="展示顺序" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品总量：</label>
+                    <div class="col-sm-8">
+                        <input name="TOTALNUMBER" placeholder="奖品总量" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">剩余数量：</label>
+                    <div class="col-sm-8">
+                        <input name="AVAILABLENUMBER" placeholder="剩余数量" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
+                    <div class="col-sm-8">
+                        <select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">发放限制次数：</label>
+                    <div class="col-sm-8">
+                        <input name="AWARDTYPEVALUE" placeholder="发放限制次数" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">领取方式：</label>
+                    <div class="col-sm-8">
+                        <select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">状态：</label>
+                    <div class="col-sm-8">
+                        <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">中奖提示：</label>
+                    <div class="col-sm-8">
+                        <input name="CUE" placeholder="中奖提示" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "activity/config"
+    $("#form-info-add").validate({
+        focusCleanup: true
+    });
+
+    /**获取奖品及信息列表*/
+    $(document).ready(function() {
+        var job= "<option value=''>所有</option>";
+        $.ajax({
+
+                url:prefix + "/prizeInfo",
+                success: function (data) {
+
+                    for(var i in data){
+                        job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
+                    }
+                    $("#PRIZECODE").html(job);
+                },
+                error : function(XMLHttpRequest, textStatus, errorThrown) {
+                    alert(errorThrown);
+                },
+                async:false             //false表示同步
+            }
+
+        );
+    });
+    function submitHandler() {
+        var PROBABILITY=$("#PROBABILITY").val();
+         probability  = (PROBABILITY.length) >0? PROBABILITY :0;
+        $("#PROBABILITY").val(probability);
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+        }
+    }
+
+    $("input[name='CREATETIMESTAMP']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='LASTUPDATETIMESTAMP']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
new file mode 100644
index 000000000..17a454502
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改存储奖项配置信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-edit" th:object="${drawConfig}">
+        <input type="hidden" name="DRAWCONFIGID" th:value="${DRAWCONFIGID}"  />
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖项名称：</label>
+                    <div class="col-sm-8">
+                        <select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品名称：</label>
+                    <div class="col-sm-8">
+                        <select name="PRIZECODE" class="form-control" id="PRIZECODE">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">中奖概率：</label>
+                    <div class="col-sm-8">
+                        <input name="PROBABILITY" id="PROBABILITY" th:field="*{PROBABILITY}" placeholder="中奖概率百分比" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">展示顺序*：</label>
+                    <div class="col-sm-8">
+                        <input name="DISPLAYORDER"  th:field="*{DISPLAYORDER}" placeholder="展示顺序" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品总量：</label>
+                    <div class="col-sm-8">
+                        <input name="TOTALNUMBER"th:field="*{TOTALNUMBER}"  placeholder="奖品总量" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">剩余数量：</label>
+                    <div class="col-sm-8">
+                        <input name="AVAILABLENUMBER" th:field="*{AVAILABLENUMBER}" placeholder="剩余数量" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
+                    <div class="col-sm-8">
+                        <select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">发放限制次数：</label>
+                    <div class="col-sm-8">
+                        <input name="AWARDTYPEVALUE" th:field="*{AWARDTYPEVALUE}" placeholder="发放限制次数" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">领取方式：</label>
+                    <div class="col-sm-8">
+                        <select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">状态：</label>
+                    <div class="col-sm-8">
+                        <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">中奖提示：</label>
+                    <div class="col-sm-8">
+                        <input name="CUE" th:field="*{CUE}" placeholder="中奖提示" class="form-control" type="text" maxlength="30">
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "activity/config"
+    $("#form-info-edit").validate({
+        focusCleanup: true
+    });
+
+    /**获取奖品及信息列表*/
+    $(document).ready(function() {
+        var PRIZECODE = [[${drawConfig.PRIZECODE}]];
+
+        var job= "<option value=''>所有</option>";
+        $.ajax({
+
+                url:prefix + "/prizeInfo",
+                success: function (data) {
+
+                    for(var i in data){
+                        if(data[i].prizecode==PRIZECODE){
+                            job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                        }
+                        job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+
+                    }
+                    $("#PRIZECODE").html(job);
+                },
+                error : function(XMLHttpRequest, textStatus, errorThrown) {
+                    alert(errorThrown);
+                },
+                async:false             //false表示同步
+            }
+
+        );
+    });
+
+    function submitHandler() {
+        var PROBABILITY=$("#PROBABILITY").val();
+        probability  = (PROBABILITY.length) >0? PROBABILITY :0;
+        $("#PROBABILITY").val(probability);
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+        }
+    }
+
+    $("input[name='CREATETIMESTAMP']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='LASTUPDATETIMESTAMP']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/configList.html b/sino-activity/src/main/resources/templates/activity/info/configList.html
new file mode 100644
index 000000000..beb8a410c
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/configList.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('存储奖项配置信息列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+	<div class="row">
+		<div class="col-sm-12 search-collapse">
+			<form id="formId">
+				<div class="select-list">
+				<ul>
+						<li >
+							<label>奖品代码：</label>
+							<input type="text" name="DRAWCODE"   th:value="${DRAWCODE}"  readonly/>
+						</li>
+						<li >
+							<label>奖品名称：</label>
+							<input type="text" name="DRAWNAME"   th:value="${DRAWNAME}" readonly/>
+						</li>
+					</ul>
+				</div>
+			</form>
+		</div>
+
+		<div class="btn-group-sm" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add(DRAWCODE)" shiro:hasPermission="config:info:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="config:info:edit">
+				<i class="fa fa-edit"></i> 修改
+			</a>
+			<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="config:info:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="config:info:export">
+				<i class="fa fa-download"></i> 导出
+			</a>
+		</div>
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table"></table>
+		</div>
+	</div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+	var editFlag = [[${@permission.hasPermi('config:info:edit')}]];
+	var removeFlag = [[${@permission.hasPermi('config:info:remove')}]];
+	var prizeLevel = [[${@dict.getType('prizeLevel')}]];
+	var AWARDTYPE = [[${@dict.getType('AWARDTYPE')}]];
+	var AWARDMETHOD = [[${@dict.getType('AWARDMETHOD')}]];
+	var statustype = [[${@dict.getType('start_stop')}]];
+	var prefix = ctx + "activity/config";
+	var DRAWCODE = [[${DRAWCODE}]];
+	$(function() {
+		var options = {
+			url: prefix + "/" + DRAWCODE + "/list",
+			createUrl: prefix + "/add/{id}",
+			updateUrl: prefix + "/edit/{id}",
+			removeUrl: prefix + "/remove",
+			exportUrl: prefix + "/export",
+			modalName: "存储奖项配置信息",
+			columns: [{
+				checkbox: true
+			},
+				{
+					field: 'drawconfigid',
+					title: '业务主键',
+					visible: false
+				},
+				{
+					field: 'prizelevel',
+					title: '奖项名称',
+					formatter: function (value, row, index) {
+						return $.table.selectDictLabel(prizeLevel, value);
+					}
+				},
+				{
+					field: 'prizename',
+					title: '奖品名称'
+				},
+				{
+					field: 'prizecode',
+					title: '奖品名称',
+					visible: false
+
+				},
+				{
+					field: 'probability',
+					title: '中奖概率',
+					formatter: function (value, row, index) {
+						return  value+'%';
+					}
+
+				},
+				{
+					field: 'totalnumber',
+					title: '奖品总量'
+				},
+				{
+					field: 'availablenumber',
+					title: '剩余数量'
+				},
+				{
+					field: 'displayorder',
+					title: '展示顺序'
+				},
+				{
+					field: 'awardtype',
+					title: '奖品发放限制',
+					formatter: function (value, row, index) {
+						return $.table.selectDictLabel(AWARDTYPE, value);
+					}
+
+				},
+				{
+					field: 'awardtypevalue',
+					title: '发放限制次数'
+				},
+				{
+					field: 'awardmethod',
+					title: '领取方式',
+					formatter: function (value, row, index) {
+						return $.table.selectDictLabel(AWARDMETHOD, value);
+					}
+
+				},
+				{
+					field: 'status',
+					title: '状态',
+					formatter: function (value, row, index) {
+						return $.table.selectDictLabel(statustype, value);
+					}
+				},
+				{
+					field: 'cue',
+					title: '提示信息'
+				},
+
+			]
+		};
+		$.table.init(options);
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
new file mode 100644
index 000000000..64f4dece1
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改抽奖活动管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-edit" th:object="${drawInfo}">
+            <input name="DRAWID" th:field="*{DRAWID}" type="hidden">
+            <input name="DRAWRULEID" th:field="*{DRAWRULEID}" type="hidden">
+            <h4 class="form-header h4">活动管理</h4>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">活动名称：</label>
+                            <div class="col-sm-8">
+                                <input name="DRAWNAME" placeholder="活动名称" th:field="*{DRAWNAME}" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">状态：</label>
+                            <div class="col-sm-8">
+                                <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{STATUS}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">消耗对象：</label>
+                            <div class="col-sm-8">
+                                <select name="EXPENO" class="form-control" th:with="type=${@dict.getType('expeType')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{EXPENO}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">消耗价值：</label>
+                            <div class="col-sm-8">
+                                <input name="EXPENOVALUE" th:field="*{EXPENOVALUE}" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">开始时间：</label>
+                            <div class="col-sm-8">
+                                <div class="input-group date">
+                                    <input name="STARTTIME" th:value="${#dates.format(drawInfo.STARTTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">结束时间：</label>
+                            <div class="col-sm-8">
+                                <div class="input-group date">
+                                    <input name="ENDTIME" th:value="${#dates.format(drawInfo.ENDTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <h4 class="form-header h4">活动规则</h4>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
+                            <div class="col-sm-8">
+                                <select name="FIRSTFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{FIRSTFLAG}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
+                            <div class="col-sm-8">
+                                <select name="FIRSTAWARDPRIZE" class="form-control" id="firstawardprize" >
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">时间段抽奖配置：</label>
+                            <div class="col-sm-8">
+                                <select name="DAILYFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{DAILYFLAG}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
+                            <div class="col-sm-8">
+                                <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
+                            <div class="col-sm-8">
+                                <div class="input-group date">
+                                    <input name="DAILYSTARTTIME"   th:value="${#dates.format(drawInfo.DAILYSTARTTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
+                            <div class="col-sm-8">
+                                <div class="input-group date">
+                                    <input name="DAILYENDTIME"   th:value="${#dates.format(drawInfo.DAILYENDTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+
+
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">抽奖必中配置：</label>
+                            <div class="col-sm-8">
+                                <select name="WILLDRAWFLAG" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{WILLDRAWFLAG}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
+                            <div class="col-sm-8">
+                                <input name="WILLDRAWAWARDNUMBER" th:field="*{WILLDRAWAWARDNUMBER}" placeholder="抽奖必中计数" class="form-control" type="text" maxlength="30">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">抽奖必中奖品：</label>
+                            <div class="col-sm-8">
+                                <select name="WILLDRAWAWARDPRIZE"  class="form-control" id="willdrawawardprize">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "activity/info"
+        $("#form-info-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.saveModal(prefix + "/edit", $('#form-info-edit').serialize());
+            }
+        }
+        /**获取奖品及信息列表*/
+        $(document).ready(function() {
+            var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]];
+            var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]];
+
+            var job= "<option value=''>所有</option>";
+            var jobj= "<option value=''>所有</option>";
+            $.ajax({
+
+                    url:prefix + "/prizeInfo",
+                    success: function (data) {
+
+                        for(var i in data){
+                            if(data[i].prizecode==WILLDRAWAWARDPRIZE){
+                            job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                            }
+                            job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+
+                        }
+                        $("#willdrawawardprize").html(job);
+                        for(var i in data){
+                            if(data[i].prizecode==FIRSTAWARDPRIZE){
+                                jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
+                            }
+                            jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+
+                        }
+                        $("#firstawardprize").html(jobj);
+
+                    },
+                    error : function(XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    },
+                    async:false             //false表示同步
+                }
+
+            );
+        });
+
+        $("input[name='STARTTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='ENDTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='DAILYSTARTTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='DAILYENDTIME']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html
new file mode 100644
index 000000000..e810fb908
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/info.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('抽奖活动管理列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <p>活动代码：</p>
+                            <input type="text" name="DRAWCODE"/>
+                        </li>
+                        <li>
+                            <p>活动名称：</p>
+                            <input type="text" name="DRAWNAME"/>
+                        </li>
+                        <li>
+                            <p>状态：</p>
+                            <select name="STATUS" th:with="type=${@dict.getType('start_stop')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="activity:info:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="activity:info:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:info:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:info:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:info:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:info:remove')}]];
+    var statustype = [[${@dict.getType('start_stop')}]];
+    var expeType = [[${@dict.getType('expeType')}]];
+    var prefix = ctx + "activity/info";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "抽奖活动管理",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'drawid',
+                    title: 'id',
+                    visible: false
+                },
+
+                {
+                    field: 'drawtype',
+                    title: '抽奖活动类型',
+                    visible: false
+                },
+                {
+                    field: 'drawname',
+                    title: '抽奖活动名称'
+                },
+                {
+                    field: 'drawcode',
+                    title: '抽奖活动代码',
+                },
+                {
+                    field: 'expeno',
+                    title: '消耗对象',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(expeType, value);
+                    }
+                },
+                {
+                    field: 'status',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(statustype, value);
+                    }
+
+                },
+                {
+                    field: 'STARTTIME',
+                    title: '开始时间'
+                },
+                {
+                    field: 'ENDTIME',
+                    title: '结束时间'
+                },
+
+                {
+                    field: 'expenovalue',
+                    title: '消耗价值'
+                },
+                {
+                    field: 'comments',
+                    title: '备注',
+                    visible: false
+                },
+                {
+                    field: 'createtimestamp',
+                    title: '创建时间'
+                },
+                {
+                    field: 'lastupdatetimestamp',
+                    title: '更新时间',
+                    visible: false
+                },
+
+                {
+                    field: 'updateflag',
+                    title: '是否需要更新缓存',
+                    visible: false
+
+                },
+                {
+                    field: 'ruledescription',
+                    title: '规则描述',
+                    visible: false
+                },
+                {
+                    field: 'VALIDATETYPE',
+                    title: '校验类型',
+                    visible: false
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick=" prizeDetail(\''+row.drawcode+'\',\''+row.drawname+'\')"><i class="fa fa-edit"></i>奖项维护</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+    function prizeDetail(drawcode,drawname) {
+        DRAWCODE = (drawcode.length) >0 ?drawcode :null;
+        DRAWNAME  = (drawname.length) >0? drawname :null;
+        var url = prefix +'/prizeDetail/' + DRAWCODE +"/" + encodeURIComponent(encodeURIComponent(DRAWNAME));;
+        $.modal.openInFoFull("奖品维护", url)
+    }
+</script>
+</body>
+</html>
\ No newline at end of file