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 index c3dfd9c45..bfd8bb05d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java +++ b/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.DrawInfo; -import com.sinosoft.activity.domain.DrawPrizeInfo; -import com.sinosoft.activity.domain.DrawRule; +import com.sinosoft.activity.domain.*; 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"; } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java index d4ca017fa..1d6416482 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigGuideMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigGuideMapper.java index d49aded4a..2dfaa8e2d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigGuideMapper.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java index 23631c9f2..b2eb752db 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java index 16dd8cac1..dae8139c5 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java +++ b/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); } 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 index 00aedc5d5..4b039bc9e 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java index 5ba07afcf..d640601e9 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigGuideService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigGuideService.java index d810e84c6..637ddc0ff 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigGuideService.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java index d1fff55a3..11a5c77e0 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java index 747ec3eb2..1a2066213 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java +++ b/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); } 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 index 1435171f3..206d1656b 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java @@ -66,4 +66,6 @@ public interface IDrawInfoService * @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 index 2145eaca9..a77dc4797 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java +++ b/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); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java index 6cbe45e2a..7e637481d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java +++ b/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); + } } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java index e4b6e19cb..d945c8529 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java +++ b/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); + } } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java index 612a13e9b..b920305d5 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java +++ b/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); + } } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java index b139ac94a..35c6e79b3 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java +++ b/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); + } } 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 index 29497fb44..d58b5978f 100644 --- 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 @@ -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); + } } diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml index 979c73ba8..b238f076a 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml @@ -40,7 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into act_config diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml index 87a21a128..018fcc9b4 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml @@ -40,7 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into act_page_config_guide diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml index c1166a1d2..93031c685 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml @@ -32,7 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into act_page_config_subscribe diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml index 896623315..2ee15820b 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml @@ -54,7 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into act_page_config_userinfo diff --git a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml index 6689c1e38..ae7fcc7a4 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml @@ -20,17 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - @@ -62,29 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml index 91fc9def8..f1dea5d40 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml @@ -46,7 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where DRAWRULEID = #{DRAWRULEID} - + + insert into draw_rule diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html index ffbcb8347..a62400d0e 100644 --- a/sino-activity/src/main/resources/templates/activity/info/edit.html +++ b/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()); } } /**获取奖品及信息列表*/ diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html index 0fe597785..3631325f1 100644 --- a/sino-activity/src/main/resources/templates/activity/info/info.html +++ b/sino-activity/src/main/resources/templates/activity/info/info.html @@ -38,7 +38,7 @@ 添加 - + 修改