活动管理-抽奖活动管理

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

@@ -7,10 +7,7 @@ import java.util.List;
 
 
 import com.alibaba.fastjson.JSON;
-import com.sinosoft.activity.domain.ActConfig;
+import com.sinosoft.activity.domain.*;
-import com.sinosoft.activity.domain.DrawInfo;
-import com.sinosoft.activity.domain.DrawPrizeInfo;
-import com.sinosoft.activity.domain.DrawRule;
 import com.sinosoft.activity.service.*;
 import com.sinosoft.activity.vo.ActVO;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -161,8 +158,26 @@ public class DrawInfoController extends BaseController
     @GetMapping("/edit/{DRAWID}")
     public String edit(@PathVariable("DRAWID") String DRAWID, ModelMap mmap)
     {
+        ActVO vo = new ActVO();
+        //查询基本信息
         DrawInfo drawInfo = drawInfoService.selectDrawInfoById(DRAWID);
-        mmap.put("drawInfo", drawInfo);
+        vo.setDrawInfo(drawInfo);
+        //查询展示内容
+        ActPageConfigGuide actPageConfigGuide = iActPageConfigGuideService.selectActPageConfigGuideByCode(drawInfo.getDRAWCODE());
+         vo.setActPageConfigGuide(actPageConfigGuide);
+        //查询选择玩法
+        DrawRule drawRule = iDrawRuleService.selectDrawRuleByCode(drawInfo.getDRAWCODE());
+        vo.setDrawRule(drawRule);
+        //查询收集信息
+        ActPageConfigUserinfo actPageConfigUserinfo=   iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawInfo.getDRAWCODE());
+        vo.setActPageConfigUserinfo(actPageConfigUserinfo);
+        //查询分享信息
+        ActConfig actConfig = iActConfigService.selectActConfigByCode(drawInfo.getDRAWCODE());
+        vo.setActConfig(actConfig);
+        //查询二维码信息
+        ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE());
+        vo.setActPageConfigSubscribe(actPageConfigSubscribe);
+        mmap.put("vo",vo);
         return prefix + "/edit";
     }
 

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

@@ -58,4 +58,10 @@ public interface ActConfigMapper
      * @return 结果
      */
     public int deleteActConfigByIds(String[] ids);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActConfig selectActConfigByCode(String drawCode);
 }

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

@@ -58,4 +58,10 @@ public interface ActPageConfigGuideMapper
      * @return 结果
      */
     public int deleteActPageConfigGuideByIds(String[] ids);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActPageConfigGuide selectActPageConfigGuideByCode(String drawCode);
 }

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

@@ -58,4 +58,10 @@ public interface ActPageConfigSubscribeMapper
      * @return 结果
      */
     public int deleteActPageConfigSubscribeByIds(String[] ids);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    public ActPageConfigSubscribe selectActPageConfigSubscribeByCode(String drawCode);
 }

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

@@ -58,4 +58,10 @@ public interface ActPageConfigUserinfoMapper
      * @return 结果
      */
     public int deleteActPageConfigUserinfoByIds(String[] ids);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActPageConfigUserinfo selectActPageConfigUserinfoByCode(String drawCode);
 }

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

@@ -59,4 +59,10 @@ public interface DrawRuleMapper
      * @return 结果
      */
     public int deleteDrawRuleByIds(String[] DRAWRULEIDs);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    public DrawRule selectDrawRuleByCode(String drawCode);
 }

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

@@ -58,4 +58,10 @@ public interface IActConfigService
      * @return 结果
      */
     public int deleteActConfigById(Integer id);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActConfig selectActConfigByCode(String drawCode);
 }

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

@@ -58,4 +58,11 @@ public interface IActPageConfigGuideService
      * @return 结果
      */
     public int deleteActPageConfigGuideById(Integer id);
+
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    public  ActPageConfigGuide selectActPageConfigGuideByCode(String drawCode);
 }

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

@@ -58,4 +58,10 @@ public interface IActPageConfigSubscribeService
      * @return 结果
      */
     public int deleteActPageConfigSubscribeById(Integer id);
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActPageConfigSubscribe selectActPageConfigSubscribeByCode(String drawCode);
 }

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

@@ -58,4 +58,11 @@ public interface IActPageConfigUserinfoService
      * @return 结果
      */
     public int deleteActPageConfigUserinfoById(Integer id);
+
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+   public ActPageConfigUserinfo selectActPageConfigUserinfoByCode(String drawCode);
 }

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

@@ -66,4 +66,6 @@ public interface IDrawInfoService
      * @return 结果
      */
     public int deleteDrawInfoById(String DRAWID);
+
+
 }

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

@@ -60,4 +60,11 @@ public interface IDrawRuleService
      * @return 结果
      */
     public int deleteDrawRuleById(String DRAWRULEID);
+
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    public DrawRule selectDrawRuleByCode(String drawCode);
 }

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

@@ -93,4 +93,13 @@ public class ActConfigServiceImpl implements IActConfigService
     {
         return actConfigMapper.deleteActConfigById(id);
     }
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    @Override
+    public ActConfig selectActConfigByCode(String drawCode) {
+        return actConfigMapper.selectActConfigByCode(drawCode);
+    }
 }

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

@@ -93,4 +93,14 @@ public class ActPageConfigGuideServiceImpl implements IActPageConfigGuideService
     {
         return actPageConfigGuideMapper.deleteActPageConfigGuideById(id);
     }
+
+    /**
+     * 根活动代码查询
+     * @param drawCode
+     * @return
+     */
+    @Override
+    public ActPageConfigGuide selectActPageConfigGuideByCode(String drawCode) {
+        return actPageConfigGuideMapper.selectActPageConfigGuideByCode(drawCode);
+    }
 }

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

@@ -93,4 +93,13 @@ public class ActPageConfigSubscribeServiceImpl implements IActPageConfigSubscrib
     {
         return actPageConfigSubscribeMapper.deleteActPageConfigSubscribeById(id);
     }
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    @Override
+    public ActPageConfigSubscribe selectActPageConfigSubscribeByCode(String drawCode) {
+        return actPageConfigSubscribeMapper.selectActPageConfigSubscribeByCode(drawCode);
+    }
 }

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

@@ -93,4 +93,13 @@ public class ActPageConfigUserinfoServiceImpl implements IActPageConfigUserinfoS
     {
         return actPageConfigUserinfoMapper.deleteActPageConfigUserinfoById(id);
     }
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    @Override
+    public ActPageConfigUserinfo selectActPageConfigUserinfoByCode(String drawCode) {
+        return actPageConfigUserinfoMapper.selectActPageConfigUserinfoByCode(drawCode);
+    }
 }

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

@@ -93,4 +93,14 @@ public class DrawRuleServiceImpl implements IDrawRuleService
     {
         return drawRuleMapper.deleteDrawRuleById(DRAWRULEID);
     }
+
+    /**
+     * 根据活动编码查询
+     * @param drawCode
+     * @return
+     */
+    @Override
+    public DrawRule selectDrawRuleByCode(String drawCode) {
+        return drawRuleMapper.selectDrawRuleByCode(drawCode);
+    }
 }

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

@@ -40,6 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActConfigVo"/>
         where id = #{id}
     </select>
+    <select id="selectActConfigByCode" resultType="com.sinosoft.activity.domain.ActConfig">
+        <include refid="selectActConfigVo"/>
+        where actCode = #{drawCode}
+    </select>
 
     <insert id="insertActConfig" parameterType="ActConfig" useGeneratedKeys="true" keyProperty="id">
         insert into act_config

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

@@ -40,6 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigGuideVo"/>
         where id = #{id}
     </select>
+    <select id="selectActPageConfigGuideByCode" resultType="ActPageConfigGuide">
+        <include refid="selectActPageConfigGuideVo"/>
+        where actCode = #{drawCode}
+    </select>
 
     <insert id="insertActPageConfigGuide" parameterType="ActPageConfigGuide" useGeneratedKeys="true" keyProperty="id">
         insert into act_page_config_guide

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

@@ -32,6 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigSubscribeVo"/>
         where id = #{id}
     </select>
+    <select id="selectActPageConfigSubscribeByCode" resultType="ActPageConfigSubscribe">
+        <include refid="selectActPageConfigSubscribeVo"/>
+        where actCode = #{drawCode}
+    </select>
 
     <insert id="insertActPageConfigSubscribe" parameterType="ActPageConfigSubscribe" useGeneratedKeys="true" keyProperty="id">
         insert into act_page_config_subscribe

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

@@ -54,6 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigUserinfoVo"/>
         where id = #{id}
     </select>
+    <select id="selectActPageConfigUserinfoByCode" resultType="ActPageConfigUserinfo">
+        <include refid="selectActPageConfigUserinfoVo"/>
+        where actCode = #{drawCode}
+    </select>
 
     <insert id="insertActPageConfigUserinfo" parameterType="ActPageConfigUserinfo" useGeneratedKeys="true" keyProperty="id">
         insert into act_page_config_userinfo

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

@@ -20,17 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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">
@@ -62,27 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult">
-SELECT
+     <include refid="selectDrawInfoVo"/>
-	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>

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

@@ -46,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDrawRuleVo"/>
         where DRAWRULEID = #{DRAWRULEID}
     </select>
+    <select id="selectDrawRuleByCode" resultType="com.sinosoft.activity.domain.DrawRule">
+        <include refid="selectDrawRuleVo"/>
+        where DRAWCODE = #{drawCode}
+
+    </select>
 
     <insert id="insertDrawRule" parameterType="DrawRule">
         insert into draw_rule

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

@@ -188,7 +188,7 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.saveModal(prefix + "/edit", $('#form-info-edit').serialize());
+                $.operate.saveTab(prefix + "/edit", $('#form-info-edit').serialize());
             }
         }
         /**获取奖品及信息列表*/

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

@@ -38,7 +38,7 @@
             <a class="btn btn-success" onclick="$.operate.addTab()" 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">
+            <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" 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">