Merge remote-tracking branch 'origin/activity' into activity

# Conflicts:
#	sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java

pom.xml

@@ -238,6 +238,8 @@
         <module>ruoyi-generator</module>
         <module>sino-activity</module>
         <module>ruoyi-common</module>
+        <module>sino-act-web</module>
+
     </modules>
     <packaging>pom</packaging>
 

sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java

@@ -2,15 +2,23 @@ package com.ruoyi.web.controller.draw;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.dto.DrawActivityRequest;
+import com.ruoyi.web.vo.Const;
 import com.ruoyi.web.vo.Result;
 import com.ruoyi.web.vo.draw.*;
 import com.sinosoft.activity.domain.DrawConfig;
+import com.sinosoft.activity.domain.*;
+import com.sinosoft.activity.service.IActPageConfigUserinfoService;
 import com.sinosoft.activity.service.IDrawConfigService;
 import com.sinosoft.activity.service.IDrawInfoService;
 import com.sinosoft.activity.service.IDrawTaskNotifyService;
+import com.sinosoft.activity.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.mp.api.WxMpService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +38,7 @@ import java.util.List;
  * @author huayue
  * @since 2020-08-13
  */
+@Api("活动管理")
 @Controller
 @RequestMapping("/draw")
 public class DrawController {
@@ -43,6 +52,15 @@ public class DrawController {
     private IDrawInfoService drawInfoService;
     @Autowired
     private WxMpService wxService;
+    @Autowired
+    private IActPageConfigGuideService actPageConfigGuideService;
+    @Autowired
+    private IActConfigService actConfigService;
+    @Autowired
+    private IActPageConfigSubscribeService iActPageConfigSubscribeService;
+
+    @Autowired
+    private IActPageConfigUserinfoService  iActPageConfigUserinfoService;
 
     private WxOAuth2UserInfo getUserInfo(HttpServletRequest request, String code) throws Exception {
 //        if (!this.wxService.switchover(appid)) {
@@ -149,6 +167,23 @@ public class DrawController {
         return result;
     }
 
+    @RequestMapping(value="/info.action", method = RequestMethod.POST)
+    @ResponseBody
+    public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) {
+        ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
+        logger.info("活动编码"+drawCode);
+        try{
+            List<ActPageConfigUserinfo> prizes = new ArrayList<ActPageConfigUserinfo>();
+            ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode);
+            prizes.add(actPageConfigUserinfo);
+            result.setActPageConfigUserinfo(prizes);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.prizes ex: ", e);
+        }
+        return  result;
+    }
     @RequestMapping(value="/prizes.action", method = RequestMethod.POST)
     @ResponseBody
     public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) {
@@ -293,4 +328,67 @@ public class DrawController {
         return result;
     }
 
+    /**
+     *  获取活动配置展示信息，根据活动编码
+     *  todo 判断活动状态
+     * @param request
+     * @param actCode
+     * @return
+     */
+    @ApiOperation("获取活动配置展示信息")
+    @ApiImplicitParam(name = "actCode", value = "活动编码", required = true, dataType = "string", paramType = "path")
+    @RequestMapping(value="/guide", method = RequestMethod.POST)
+    @ResponseBody
+    public Result getActGuide(HttpServletRequest request, String actCode) {
+        ActGuideResult result = new ActGuideResult();
+        try {
+            //查询活动内容
+            DrawInfo drawInfo = new DrawInfo();
+            drawInfo.setDRAWCODE(actCode);
+            drawInfo.setSTATUS("1");
+            List<DrawInfo> drawInfos = drawInfoService.selectDrawInfoList(drawInfo);
+            result.setDrawInfo(drawInfos.get(0));
+            //查询获取风格
+            ActConfig actConfig = actConfigService.selectActConfigByCode(actCode);
+            result.setPageStyle(actConfig.getPageStyle());
+            result.setActType(actConfig.getActType());
+            //获取页面展示内容配置
+            ActPageConfigGuide actPageConfigGuide = actPageConfigGuideService.selectActPageConfigGuideByCode(actCode);
+            result.setActPageConfigGuide(actPageConfigGuide);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.saveAddress ex: ", e);
+        }
+        return result;
+    }
+
+    /**
+     *  获取活动配置展示信息，根据活动编码
+     *
+     * @param request
+     * @param actCode
+     * @return
+     */
+    @ApiOperation("获取二维码信息")
+    @ApiImplicitParam(name = "actCode", value = "活动编码", required = true, dataType = "string", paramType = "path")
+    @RequestMapping(value="/qrCode", method = RequestMethod.POST)
+    @ResponseBody
+    public ActPageConfigSubscribeResult qrcode(HttpServletRequest request, String actCode) {
+        ActPageConfigSubscribeResult result = new  ActPageConfigSubscribeResult ();
+        try {
+            List<ActPageConfigSubscribe> list = new ArrayList<>();
+
+            ActPageConfigSubscribe subscribe = iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(actCode);
+            list.add(subscribe);
+            result.setActPageConfigSubscribe(list);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.saveAddress ex: ", e);
+        }
+        return result;
+    }
+
+
 }

sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActGuideResult.java

@@ -0,0 +1,25 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigGuide;
+import com.sinosoft.activity.domain.DrawInfo;
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author dy
+ * @version 1.0
+ * @date 2021/4/14 14:38
+ */
+@Data
+public class ActGuideResult extends Result {
+    private ActPageConfigGuide actPageConfigGuide;
+
+    private DrawInfo drawInfo;
+
+    private Integer pageStyle;
+
+    private  Integer actType;
+
+}

sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java

@@ -0,0 +1,18 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+
+import java.util.List;
+
+public class ActPageConfigSubscribeResult extends Result {
+    private List<ActPageConfigSubscribe> actPageConfigSubscribe;
+
+    public List<ActPageConfigSubscribe> getActPageConfigSubscribe() {
+        return actPageConfigSubscribe;
+    }
+
+    public void setActPageConfigSubscribe(List<ActPageConfigSubscribe> actPageConfigSubscribe) {
+        this.actPageConfigSubscribe = actPageConfigSubscribe;
+    }
+}

sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java

@@ -0,0 +1,21 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+
+import java.util.List;
+
+
+public class ActPageConfigUserinfoResult extends Result
+{
+
+ private List<ActPageConfigUserinfo> actPageConfigUserinfo;
+
+    public List<ActPageConfigUserinfo> getActPageConfigUserinfo() {
+        return actPageConfigUserinfo;
+    }
+
+    public void setActPageConfigUserinfo(List<ActPageConfigUserinfo> actPageConfigUserinfo) {
+        this.actPageConfigUserinfo = actPageConfigUserinfo;
+    }
+}

sino-act-web/src/main/resources/public/draw/actGuide.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <meta charset="UTF-8">
+    <meta name="format-detection" content="telephone=no"/>
+    <title>活动</title>
+    <link rel="stylesheet" href="css/reset.css">
+    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" type="text/css" href="css/popup.css"/>
+    <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/register.css"/>
+    <link rel="stylesheet" type="text/css" href="css/winPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/goods.css"/>
+    <link rel="stylesheet" type="text/css" href="css/rule.css"/>
+    <script src="/js/config.js"></script>
+    <style type="text/css">
+        .button { /* 按钮美化 */
+            width: 200px; /* 宽度 */
+            height: 40px; /* 高度 */
+            border-width: 0px; /* 边框宽度 */
+            border-radius: 3px; /* 边框半径 */
+            background: #1E90FF; /* 背景颜色 */
+            cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
+            outline: none; /* 不显示轮廓线 */
+            font-family: Microsoft YaHei; /* 设置字体 */
+            color: white; /* 字体颜色 */
+            font-size: 17px; /* 字体大小 */
+        }
+        .button:hover { /* 鼠标移入按钮范围时改变颜色 */
+            background: #5599FF;
+        }
+        p {
+            clear: both;
+            padding-bottom: 2em;
+        }
+        .title {
+            text-align: center;
+            position: absolute;
+            top: 20%;
+            font-size: 37px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .desc {
+            text-align: center;
+            position: absolute;
+            top: 30%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .btntext {
+            text-align: center;
+            position: absolute;
+            top: 60%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .btntext2 {
+            text-align: center;
+            position: absolute;
+            top: 70%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+    </style>
+    <link rel="stylesheet" href="css/main.css">
+    <script src="js/jquery-1.9.1.min.js"></script>
+    <script src="js/awardRotate.js"></script>
+    <script src="js/util.js"></script>
+    <script src="js/draw.js"></script>
+    <script>
+        $(document).ready(function () {
+            $.ajax({
+                type: "POST",
+                async: false,
+                url: contextRootPath + "/draw/guide",
+                data: {actCode: drawCode},
+                dataType: "json",
+                success: function (data) {
+                    //todo 根据风格改变css样式
+                        $('title').html(data.drawInfo.drawname);
+                        $(".act_guide").attr("background",data.actPageConfigGuide.bgImg);
+                        $("#title").text(data.actPageConfigGuide.actTitle);
+                        $("#desc").text(data.actPageConfigGuide.actDesc);
+                        $("#btntext").val(data.actPageConfigGuide.btnText);
+                        $("#btntext2").val(data.actPageConfigGuide.btnText2);
+                        $("#flag").val(data.actType);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    console.log('网络异常', textStatus, errorThrown);
+                }
+            });
+        });
+
+    </script>
+</head>
+
+<body  class="template_bg popupBox act_guide" style="background-color: #fbdaaf;
+                background-repeat:no-repeat;
+               background-attachment:fixed;
+               background-size:100% 100%;">
+    <div>
+        <h1 class="title" id="title"></h1>
+        <h2 class="desc" id="desc"></h2>
+        <p class="btntext"><input class="button" id="btntext" type="button" onclick="jump()"/></p>
+        <p class="btntext2"><input class="button" id="btntext2" type="button"/></p>
+        <input id="flag" type="hidden" value=""/>
+    </div>
+
+<script src="js/main.js"></script>
+<script src="js/scroll.js"></script>
+<script src="js/common.js"></script>
+</body>
+<script>
+    function jump(){
+        var flag = $("#flag").val;
+        //根据不同玩法跳转不同页面
+        if (flag == "0"){
+            window.location.href='turntable.html?drawCode='+drawCode;
+        }else{
+            window.location.href='scratchcard.html?drawCode='+drawCode;
+        }
+    }
+</script>
+
+</html>

sino-act-web/src/main/resources/public/draw/qrCode.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <meta charset="UTF-8">
+    <meta name="format-detection" content="telephone=no"/>
+    <title>活动</title>
+    <link rel="stylesheet" href="css/reset.css">
+    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" type="text/css" href="css/popup.css"/>
+    <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/register.css"/>
+    <link rel="stylesheet" type="text/css" href="css/winPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/goods.css"/>
+    <link rel="stylesheet" type="text/css" href="css/rule.css"/>
+    <script src="/js/config.js"></script>
+    <style type="text/css">
+        .button { /* 按钮美化 */
+            width: 200px; /* 宽度 */
+            height: 40px; /* 高度 */
+            border-width: 0px; /* 边框宽度 */
+            border-radius: 3px; /* 边框半径 */
+            background: #1E90FF; /* 背景颜色 */
+            cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
+            outline: none; /* 不显示轮廓线 */
+            font-family: Microsoft YaHei; /* 设置字体 */
+            color: white; /* 字体颜色 */
+            font-size: 17px; /* 字体大小 */
+        }
+        .button:hover { /* 鼠标移入按钮范围时改变颜色 */
+            background: #5599FF;
+        }
+        p {
+            clear: both;
+            padding-bottom: 2em;
+        }
+        .drawCodeImgPic {
+            display: block;
+            margin:250px auto;
+            width: 200px;
+            height: 200px;
+        }
+
+        .drawQrCodePri {
+            text-align: center;
+            position: absolute;
+            top: 70%;
+            font-size: 25px;
+            left: 0%;
+            color: #F00;
+            width: 100%;
+        }
+    </style>
+    <link rel="stylesheet" href="css/main.css">
+    <script src="js/jquery-1.9.1.min.js"></script>
+    <script src="js/awardRotate.js"></script>
+    <script src="js/util.js"></script>
+    <script src="js/draw.js"></script>
+    <script>
+        $(document).ready(function () {
+            $.ajax({
+                type: "POST",
+                async: false,
+                url: contextRootPath + "/draw/qrCode",
+                data: {actCode: drawCode},
+                dataType: "json",
+                success: function (data) {
+                    //todo 根据风格改变css样式
+                        $(".act_guide").attr("background",data.actPageConfigSubscribe[0].bgImg);
+                        $("#qrCodeImgimg").attr("src",data.actPageConfigSubscribe[0].qrCode);
+                        $("#qrCodePri").text(data.actPageConfigSubscribe[0].description);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    console.log('网络异常', textStatus, errorThrown);
+                }
+            });
+        });
+
+    </script>
+</head>
+
+<body  class="template_bg popupBox act_guide" style="background-color: #fbdaaf;
+                background-repeat:no-repeat;
+               background-attachment:fixed;
+               background-size:100% 100%;">
+    <div>
+               <p class="drawCodeImgPic">
+                    <img id="qrCodeImgimg" src=""  >
+                </p>
+                <h1 class="drawQrCodePri" id="qrCodePri"></h1>
+
+    </div>
+
+<script src="js/main.js"></script>
+<script src="js/scroll.js"></script>
+<script src="js/common.js"></script>
+</body>
+<script>
+    function jump(){
+        var flag = $("#flag").val;
+        //根据不同玩法跳转不同页面
+        if (flag == "0"){
+            window.location.href='turntable.html?drawCode='+drawCode;
+        }else{
+            window.location.href='scratchcard.html?drawCode='+drawCode;
+        }
+    }
+</script>
+
+</html>

sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java

@@ -188,16 +188,20 @@ public class DrawInfoController extends BaseController
     @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(DrawInfo drawInfo)
+        public AjaxResult editSave(@RequestBody ActVO vo)
-    {
+        {
-        logger.info("修改存储抽奖特殊规则对象传参："+JSON.toJSONString(drawInfo));
+            try{
-        drawInfo.setLASTUPDATETIMESTAMP(new Date());
+                logger.info("前台传参"+ JSON.toJSONString(vo));
-        drawInfoService.updateDrawInfo(drawInfo);
+                Date date = new Date();
-        DrawRule drawRule = new  DrawRule();
+
-        BeanUtils.copyProperties(drawInfo,drawRule);
+                int i = drawInfoService.updateActVO(vo);
-        logger.info("修改存储抽奖特殊规则对象入参："+JSON.toJSONString(drawRule));
+                return toAjax(i);
-        int i = iDrawRuleService.updateDrawRule(drawRule);
+            }
-        return toAjax(i);
+            catch (Exception e) {
+                e.printStackTrace();
+                return AjaxResult.error("系统繁忙");
+            }
+            
     }
 
     /**
@@ -209,6 +213,8 @@ public class DrawInfoController extends BaseController
     @ResponseBody
     public AjaxResult remove(String ids)
     {
+
+
         return toAjax(drawInfoService.deleteDrawInfoByIds(ids));
     }
 

sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java

@@ -246,4 +246,5 @@ public class ActPageConfigUserinfo extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
 }

sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java

@@ -70,5 +70,5 @@ public interface DrawRuleMapper
      *  根据活动代码删除抽奖活动管理信息
      * @param toStrArray
      */
-   public void deleteDrawRuleByIdCode(String[] toStrArray);
+   public int deleteDrawRuleByIdCode(String[] toStrArray);
 }

sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java

@@ -2,6 +2,7 @@ package com.sinosoft.activity.service;
 
 
 import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.vo.ActVO;
 
 import java.util.List;
 
@@ -67,5 +68,10 @@ public interface IDrawInfoService
      */
     public int deleteDrawInfoById(String DRAWID);
 
-
+    /**
+     * 新增抽奖活动信息
+     * @param vo
+     * @return
+     */
+   public  int updateActVO(ActVO vo);
 }

sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java

@@ -1,12 +1,14 @@
 package com.sinosoft.activity.service.impl;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.domain.*;
 import com.sinosoft.activity.mapper.*;
 import com.sinosoft.activity.service.IDrawInfoService;
+import com.sinosoft.activity.vo.ActVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -85,6 +87,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
     @Override
     public int updateDrawInfo(DrawInfo drawInfo)
     {
+
         return drawInfoMapper.updateDrawInfo(drawInfo);
     }
 
@@ -104,7 +107,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         //根据ID查询抽奖活动信息
         List<DrawInfo> drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo);
         //删除活动管理信息
-        int i = drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids));
+        drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids));
         List<String> collect = drawInfos.stream().map(DrawInfo::getDRAWCODE).collect(Collectors.toList());
         String policyEndorseNos = String.join(",",collect);
 
@@ -117,7 +120,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         //根据活动代码删除活动收集配置信息
         actPageConfigUserinfoMapper.deleteActPageConfigUserinfoByCode(Convert.toStrArray(policyEndorseNos));
         //根据活动代码删除抽奖活动管理信息
-        drawRuleMapper.deleteDrawRuleByIdCode(Convert.toStrArray(policyEndorseNos));
+        int i = drawRuleMapper.deleteDrawRuleByIdCode(Convert.toStrArray(policyEndorseNos));
         return i;
     }
 
@@ -132,4 +135,53 @@ public class DrawInfoServiceImpl implements IDrawInfoService
     {
         return drawInfoMapper.deleteDrawInfoById(DRAWID);
     }
+
+    /**
+     * 新增抽奖活动信息
+     * @param vo
+     * @return
+     */
+    @Override
+    public int updateActVO(ActVO vo) {
+        Date date = new Date();
+
+        DrawInfo drawInfo = vo.getDrawInfo();
+        drawInfo.setLASTUPDATETIMESTAMP(date);
+
+        //修改抽奖活动管理对象
+        String drawcode = drawInfo.getDRAWCODE();
+        drawInfoMapper.updateDrawInfo(drawInfo);
+
+        //修改活动配置
+        ActConfig actConfig = vo.getActConfig();
+        actConfig.setUpdateTime(date);
+        actConfig.setActCode(drawcode);
+        actConfigMapper.updateActConfig(actConfig);
+
+        //修改活动展示内容配置
+        ActPageConfigGuide actPageConfigGuide = vo.getActPageConfigGuide();
+        actPageConfigGuide.setUpdateTime(date);
+        actPageConfigGuide.setActCode(drawcode);
+        actPageConfigGuideMapper.updateActPageConfigGuide(actPageConfigGuide);
+
+
+        //修改活动收集配置
+        ActPageConfigSubscribe actPageConfigSubscribe = vo.getActPageConfigSubscribe();
+        actPageConfigSubscribe.setUpdateTime(date);
+        actPageConfigSubscribe.setActCode(drawcode);
+        actPageConfigSubscribeMapper.updateActPageConfigSubscribe(actPageConfigSubscribe);
+
+        //修改活动用户信息
+        ActPageConfigUserinfo actPageConfigUserinfo = vo.getActPageConfigUserinfo();
+        actPageConfigUserinfo.setUpdateTime(date);
+        actPageConfigUserinfo.setActCode(drawcode);
+        actPageConfigUserinfoMapper.updateActPageConfigUserinfo(actPageConfigUserinfo);
+
+        //修改查询抽奖活动管理对象
+        DrawRule drawRule = vo.getDrawRule();
+        drawRule.setDRAWCODE(drawcode);
+        drawRule.setLASTUPDATETIMESTAMP(date);
+        int i = drawRuleMapper.updateDrawRule(drawRule);
+        return i;
+    }
 }

sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml

@@ -78,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="pageStyle != null">page_style = #{pageStyle},</if>
             <if test="actType != null">act_type = #{actType},</if>
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="actName != null">act_name = #{actName},</if>
             <if test="shareTitle != null">share_title = #{shareTitle},</if>
             <if test="shareDesc != null">share_desc = #{shareDesc},</if>
@@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActConfigById" parameterType="Integer">

sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml

@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigGuide" parameterType="ActPageConfigGuide">
         update act_page_config_guide
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="actTitle != null">act_title = #{actTitle},</if>
             <if test="actDesc != null">act_desc = #{actDesc},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
@@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigGuideById" parameterType="Integer">

sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml

@@ -60,14 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigSubscribe" parameterType="ActPageConfigSubscribe">
         update act_page_config_subscribe
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="description != null">description = #{description},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigSubscribeById" parameterType="Integer">

sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml

@@ -104,25 +104,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigUserinfo" parameterType="ActPageConfigUserinfo">
         update act_page_config_userinfo
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="title != null">title = #{title},</if>
             <if test="description != null">description = #{description},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
             <if test="btnText != null">btn_text = #{btnText},</if>
             <if test="btnLink != null">btn_link = #{btnLink},</if>
             <if test="agreement != null">agreement = #{agreement},</if>
-            <if test="userName != null">user_name = #{userName},</if>
+            user_name = #{userName},
-            <if test="mobile != null">mobile = #{mobile},</if>
+            mobile = #{mobile},
-            <if test="gender != null">gender = #{gender},</if>
+            gender = #{gender},
-            <if test="address != null">address = #{address},</if>
+            address = #{address},
-            <if test="agentName != null">agent_name = #{agentName},</if>
+            agent_name = #{agentName},
-            <if test="agentMobile != null">agent_mobile = #{agentMobile},</if>
+            agent_mobile = #{agentMobile},
-            <if test="agentGender != null">agent_gender = #{agentGender},</if>
+            agent_gender = #{agentGender},
-            <if test="agentNo != null">agent_no = #{agentNo},</if>
+            agent_no = #{agentNo},
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigUserinfoById" parameterType="Integer">

sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml

@@ -89,7 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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>
@@ -102,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
             <if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER},</if>
         </trim>
-        where DRAWRULEID = #{DRAWRULEID}
+        where DRAWCODE = #{DRAWCODE}
     </update>
 
     <delete id="deleteDrawRuleById" parameterType="String">

sino-activity/src/main/resources/templates/activity/info/add.html

@@ -5,8 +5,21 @@
     <th:block th:include="include :: datetimepicker-css"/>
     <th:block th:include="include :: jquery-smartwizard-css"/>
     <th:block th:include="include :: jasny-bootstrap-css"/>
+    <th:block th:include="include :: summernote-css" />
 </head>
 <style type='text/css'>
+    /* 如果要让工具栏固定在页面底部,使用下面的样式,不需要的可以注释 */
+    /*.sw>.toolbar-bottom{*/
+    /*    z-index: 100;*/
+    /*    bottom: 0px;*/
+    /*    left: 0;*/
+    /*    width: 100%;*/
+    /*    position: fixed;*/
+    /*    text-align: right;*/
+    /*    background: #fff;*/
+    /*    box-shadow: 0 -2px 6px 1px hsla(223,8%,83%,.5);*/
+    /*    border-top: 1px solid #e3e4e8;*/
+    /*}*/
     .rightarea {
         float: left;
         width: 40%;
@@ -19,10 +32,10 @@
         height: 500px;
     }
 
-    .sw > .tab-content {
+    /*.sw > .tab-content {*/
-        overflow-x: hidden;
+    /*    overflow-x: hidden;*/
-        overflow-y: auto;
+    /*    overflow-y: auto;*/
-    }
+    /*}*/
 
     .col-sm-6 {
         width: 50%;
@@ -140,19 +153,21 @@
 
     /* 配置分享信息*/
     .drawShareTitlePri {
+        text-align: center;
         position: absolute;
-        top: 45%;
+        top: 20%;
         font-size: 20px;
-        left: 73%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
 
     .drawShareDescribePri {
+        text-align: center;
         position: absolute;
         top: 50%;
         font-size: 10px;
-        left: 73%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
@@ -160,22 +175,13 @@
     .drawShareImgPic {
         text-align: center;
         position: absolute;
-        top: 52%;
+        top: 50%;
         font-size: 37px;
-        left: 38%;
+        left: 25%;
         color: #F00;
         width: 100%;
     }
 
-    .drawShareImg2Pic {
-        text-align: center;
-        position: absolute;
-        top: 40%;
-        font-size: 37px;
-        left: 30%;
-        color: #F00;
-        width: 100%;
-    }
 
     /* 关注二维码*/
 
@@ -204,9 +210,12 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" >
     <form class="form-horizontal m" id="form-info-add">
-
+        <div class="row">
+        <div class="col-sm-12">
+        <div class="ibox">
+        <div class="ibox-content">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -231,7 +240,7 @@
                     <a class="nav-link" href="#step-7"> 关注二维码 </a>
                 </li>
             </ul>
-            <div class="tab-content" style="height: 610px;">
+            <div class="tab-content" >
                 <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
                     <div>
                         <form class="form form-horizontal m-t">
@@ -312,7 +321,7 @@
                     </div>
                 </div>
                 <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div>
+                    <div style="height: 600px">
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
                             <a id="activityTemplate" th:if="${dict.dictValue} != '0'" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -322,11 +331,11 @@
                         </div>
                         <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden">
                         <h4 id="activityTemplateh4" class="form-header h4">暂不选择</h4>
-                        <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="500">
+                        <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="400px" style="display: none">
                     </div>
                 </div>
-                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 130%">
-                    <div style="height: 610px">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第3步-配置展现内容</h4>
                             <div class="row">
@@ -377,7 +386,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
                                                    class="form-control"
                                                    type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
@@ -385,43 +394,43 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
+<!--                            <div class="row">-->
-                                <div class="col-sm-6">
+<!--                                <div class="col-sm-6">-->
-                                    <div class="form-group">
+<!--                                    <div class="form-group">-->
-                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
+<!--                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>-->
-                                        <div class="col-sm-8">
+<!--                                        <div class="col-sm-8">-->
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
+<!--                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"-->
-                                                   class="form-control"
+<!--                                                   class="form-control"-->
-                                                   type="text"
+<!--                                                   type="text"-->
-                                                   maxlength="30">
+<!--                                                   maxlength="30">-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </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">自定义按钮2：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
                                                    class="form-control" type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
+                            <div class="row" style="height: 850">
-                                <div class="col-sm-6">
+                                    <div class="form-group" style="float: left">
-                                    <div class="form-group">
+                                        <div  style="width: 60%">
-                                        <label class="col-sm-4 control-label is-required">按钮2跳转链接：</label>
+                                        <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30">
                                         </div>
+                                        <div class="col-sm-8">
+                                            <div class="summernote">
+                                                例如：http：//xx
+                                            </div>
+                                        </div>
+                                        <textarea id="btnLink2"  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
                                     </div>
-                                </div>
                             </div>
 
                         </div>
@@ -441,7 +450,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 120%">
                     <h4 class="form-header h4">第4步-选择玩法</h4>
                     <div th:with="type=${@dict.getType('activityPlay')}">
                         <a id="activityPlay" th:if="${dict.dictValue} != '0'" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -450,7 +459,9 @@
                            th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
                     </div>
                     <input type="hidden" name="actConfig-actType" id="activityPlayval" value="">
-                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
+                    <div style="height: 300">
+                        <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300" style="display: none">
+                    </div>
                     <h4 class="form-header h4">活动规则</h4>
                     <div class="row" id="activityPlaydiv" style="display: none">
                         <div class="col-sm-6">
@@ -471,7 +482,11 @@
                                 <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
                                 <div class="col-sm-8">
                                     <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                             disabled>
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
                                     </select>
                                 </div>
                             </div>
@@ -558,7 +573,11 @@
                                     <div class="col-sm-8">
                                         <select name="drawRule-willdrawawardprize" class="form-control"
                                                 id="willdrawawardprize"
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                                 disabled>
+                                            <option value="">所有</option>
+                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                    th:value="${drawPrize.PRIZECODE}"></option>
                                         </select>
                                     </div>
                                 </div>
@@ -566,8 +585,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
+                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5" style="height: 100%">
-                    <div style="height: 810px">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -597,10 +616,9 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">协议内容：</label>
+                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
-                                        <div class="col-sm-8">
+                                        <div class="col-xs-8">
-                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement"   cols="40" rows="6" onkeyup="updatePri(this)">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement"  onkeyup="updatePri(this)" maxlength="500" class="form-control" rows="5"></textarea>
-                                            </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -637,18 +655,6 @@
                                     </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="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
@@ -749,8 +755,8 @@
 
                     </div>
                 </div>
-                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
+                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6" style="height: 100%">
-                    <div style="height: 610px">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第六步-配置分享信息</h4>
                             <div class="row">
@@ -781,9 +787,8 @@
                                 <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="col-xs-8">
-                                             <textarea id="shareDescribe"  name="actConfig-shareDesc"  cols="40" rows="6" onkeyup="updatePri(this)">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"  onkeyup="updatePri(this)" maxlength="500" class="form-control" rows="5"></textarea>
-                                            </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -809,24 +814,21 @@
                         </div>
                         <div class="rightarea">
                             <h4 class="form-header h4">效果图</h4>
-                            <div style="height: 210px">
+                            <div style="position: relative;text-align:center">
-                                <div class="drawShareImg2Pic">
+                                    <img  src="../../../img/bj.png" height="170" width="340">
-                                    <img id="ss" src="../../img/bj.png" height="170" width="340">
+                                <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
+                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
+
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
                                 </div>
-                                <div>
-                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
-                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
 
                             </div>
                         </div>
                     </div>
                 </div>
-                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
+                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7" style="height: 100%">
-                    <div style="height: 610px">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第七步-关注二维码</h4>
                             <div class="row">
@@ -894,44 +896,22 @@
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
+        </div>
+        </div>
+        </div>
+        </div>
     </form>
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
 <th:block th:include="include :: jquery-smartwizard-js"/>
 <th:block th:include="include :: jasny-bootstrap-js"/>
+<th:block th:include="include :: summernote-js" />
 <script th:inline="javascript">
     var prefix = ctx + "activity/info"
 
-    /**获取奖品及信息列表*/
-    $(document).ready(function () {
-        var job = "";
-        $.ajax({
-
-                url: prefix + "/prizeInfo",
-                success: function (data) {
-
-                    for (var i in data) {
-                        if (job.length == 0) {
-                            job = "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
-                        } else {
-                            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
     });
@@ -1023,11 +1003,17 @@
 </script>
 <script th:inline="javascript">
     $(document).ready(function () {
+        $('.summernote').summernote({
+            height:200,
+            lang: 'zh-CN'
+        });
         // 工具栏按钮
         var btnFinish = $('<a id="btn-finish"></a>').text('完成')
             .addClass('btn btn-info')
             .on('click', function () {
                 //添加保存逻辑
+                var markupStr  = $('.summernote').summernote('code');
+                $("btnLink2").val(markupStr);
                 var data = customSerialize("form-info-add", true);
                 $.ajax({
                     url: prefix + "/add",
@@ -1211,8 +1197,12 @@
         $("#"+id+"img").attr("src",path+valus+".jpg");
         if (valus != "0"){
             $("#activityPlaydiv").css('display','block');//显示
+            $("#activityTemplateimg").css('display','block');//显示
+            $("#activityPlayimg").css('display','block');//显示
         }else{
             $("#activityPlaydiv").css('display','none');//隐藏
+            $("#activityTemplateimg").css('display','none');
+            $("#activityPlayimg").css('display','none');
         }
 
     }