diff --git a/ruoyi-admin/src/main/resources/static/img/bj.png b/ruoyi-admin/src/main/resources/static/img/bj.png new file mode 100644 index 000000000..042d0c051 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/bj.png differ 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 454afdc1a..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; @@ -76,39 +73,46 @@ public class DrawInfoController extends BaseController @ResponseBody public AjaxResult addSave(@RequestBody ActVO vo) { - logger.info("前台传参"+ JSON.toJSONString(vo)); - SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - Date date = new Date(); - //新增基本信息 - vo.getDrawInfo().setCREATETIMESTAMP(date); - String code = format.format(date); - vo.getDrawInfo().setDRAWCODE(code); - drawInfoService.insertDrawInfo(vo.getDrawInfo()); + try{ + logger.info("前台传参"+ JSON.toJSONString(vo)); + SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + Date date = new Date(); + //新增基本信息 + vo.getDrawInfo().setCREATETIMESTAMP(date); + String code = format.format(date); + vo.getDrawInfo().setDRAWCODE(code); + drawInfoService.insertDrawInfo(vo.getDrawInfo()); - //新增展示内容 - vo.getActPageConfigGuide().setCreateTime(date); - vo.getActPageConfigGuide().setActCode(code); - iActPageConfigGuideService.insertActPageConfigGuide(vo.getActPageConfigGuide()); + //新增展示内容 + vo.getActPageConfigGuide().setCreateTime(date); + vo.getActPageConfigGuide().setActCode(code); + iActPageConfigGuideService.insertActPageConfigGuide(vo.getActPageConfigGuide()); - //新增选择玩法 - vo.getDrawRule().setCREATETIMESTAMP(date); - vo.getDrawRule().setDRAWCODE(code); - iDrawRuleService.insertDrawRule(vo.getDrawRule()); + //新增选择玩法 + vo.getDrawRule().setCREATETIMESTAMP(date); + vo.getDrawRule().setDRAWCODE(code); + iDrawRuleService.insertDrawRule(vo.getDrawRule()); - //新增收集信息 - vo.getActPageConfigUserinfo().setCreateTime(date); - vo.getActPageConfigUserinfo().setActCode(code); - iActPageConfigUserinfoService.insertActPageConfigUserinfo(vo.getActPageConfigUserinfo()); + //新增收集信息 + vo.getActPageConfigUserinfo().setCreateTime(date); + vo.getActPageConfigUserinfo().setActCode(code); + iActPageConfigUserinfoService.insertActPageConfigUserinfo(vo.getActPageConfigUserinfo()); - //新增分享信息 - vo.getActConfig().setCreateTime(date); - vo.getActConfig().setActCode(code); - iActConfigService.insertActConfig(vo.getActConfig()); - //新增二维码信息 - vo.getActPageConfigSubscribe().setCreateTime(date); - vo.getActPageConfigSubscribe().setActCode(code); - int i = iActPageConfigSubscribeService.insertActPageConfigSubscribe(vo.getActPageConfigSubscribe()); - return toAjax(i); + //新增分享信息 + vo.getActConfig().setCreateTime(date); + vo.getActConfig().setActCode(code); + vo.getActConfig().setActName(vo.getDrawInfo().getDRAWNAME()); + iActConfigService.insertActConfig(vo.getActConfig()); + //新增二维码信息 + vo.getActPageConfigSubscribe().setCreateTime(date); + vo.getActPageConfigSubscribe().setActCode(code); + int i = iActPageConfigSubscribeService.insertActPageConfigSubscribe(vo.getActPageConfigSubscribe()); + return toAjax(i); + } + catch (Exception e){ + e.printStackTrace(); + return AjaxResult.error("系统繁忙"); + } } /** * 查询抽奖活动管理列表 @@ -154,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/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java index 163dd111e..b5e203bb2 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java @@ -5,6 +5,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 抽奖活动管理对象 draw_info @@ -78,6 +79,15 @@ public class DrawInfo extends BaseEntity /** */ private String VALIDATETYPE; + private List drawId; + + public List getDrawId() { + return drawId; + } + + public void setDrawId(List drawId) { + this.drawId = drawId; + } public void setDRAWID(String DRAWID) { diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java index 2865dd261..f15ddb77d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawPrizeInfo.java @@ -57,6 +57,18 @@ public class DrawPrizeInfo extends BaseEntity /** 积分项目编码 */ @Excel(name = "积分项目编码") private String INTEGRALPROJECTCODE; + /** + * 奖品图片 + */ + private String PRIZEIMG; + + public String getPRIZEIMG() { + return PRIZEIMG; + } + + public void setPRIZEIMG(String PRIZEIMG) { + this.PRIZEIMG = PRIZEIMG; + } public void setPRIZEID(int PRIZEID) { 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..e427e7b35 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,16 @@ public interface ActConfigMapper * @return 结果 */ public int deleteActConfigByIds(String[] ids); + /** + * 根据活动编码查询 + * @param drawCode + * @return + */ + public ActConfig selectActConfigByCode(String drawCode); + + /** + * 根据活动代码删除活动配置信息 + * @param toStrArray + */ + public void deleteActConfigByCode(String[] toStrArray); } 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..a1217f1d7 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,16 @@ public interface ActPageConfigGuideMapper * @return 结果 */ public int deleteActPageConfigGuideByIds(String[] ids); + /** + * 根据活动编码查询 + * @param drawCode + * @return + */ + public ActPageConfigGuide selectActPageConfigGuideByCode(String drawCode); + + /** + * 根据活动代码删除活动展示内容配置信息 + * @param toStrArray + */ + public void deleteActPageConfigGuideByCode(String[] toStrArray); } 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..a6947c6eb 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,16 @@ public interface ActPageConfigSubscribeMapper * @return 结果 */ public int deleteActPageConfigSubscribeByIds(String[] ids); + /** + * 根据活动编码查询 + * @param drawCode + * @return + */ + public ActPageConfigSubscribe selectActPageConfigSubscribeByCode(String drawCode); + + /** + * 根据活动代码删除活动配置信息 + * @param toStrArray + */ + public void deleteActPageConfigSubscribeByCode(String[] toStrArray); } 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..8ee4d808a 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,16 @@ public interface ActPageConfigUserinfoMapper * @return 结果 */ public int deleteActPageConfigUserinfoByIds(String[] ids); + /** + * 根据活动编码查询 + * @param drawCode + * @return + */ + public ActPageConfigUserinfo selectActPageConfigUserinfoByCode(String drawCode); + + /** + * 根据活动代码删除活动收集配置信息 + * @param toStrArray + */ + public void deleteActPageConfigUserinfoByCode(String[] toStrArray); } 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..b2c8bee51 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,16 @@ public interface DrawRuleMapper * @return 结果 */ public int deleteDrawRuleByIds(String[] DRAWRULEIDs); + /** + * 根据活动编码查询 + * @param drawCode + * @return + */ + public DrawRule selectDrawRuleByCode(String drawCode); + + /** + * 根据活动代码删除抽奖活动管理信息 + * @param toStrArray + */ + public void deleteDrawRuleByIdCode(String[] toStrArray); } 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/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java index 948480cc0..1401908e1 100644 --- 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 @@ -1,9 +1,11 @@ package com.sinosoft.activity.service.impl; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import com.sinosoft.activity.domain.DrawInfo; -import com.sinosoft.activity.mapper.DrawInfoMapper; +import com.sinosoft.activity.mapper.*; import com.sinosoft.activity.service.IDrawInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +23,17 @@ public class DrawInfoServiceImpl implements IDrawInfoService { @Autowired private DrawInfoMapper drawInfoMapper; + @Autowired + private ActConfigMapper actConfigMapper; + @Autowired + private ActPageConfigGuideMapper actPageConfigGuideMapper; + @Autowired + private ActPageConfigSubscribeMapper actPageConfigSubscribeMapper; + @Autowired + private ActPageConfigUserinfoMapper actPageConfigUserinfoMapper; + @Autowired + private DrawRuleMapper drawRuleMapper; + /** * 查询抽奖活动管理对象 @@ -76,7 +89,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService } /** - * 删除抽奖活动管理对象对象 + * 删除抽奖活动管理及其相关活动配置信息 * * @param ids 需要删除的数据ID * @return 结果 @@ -84,7 +97,28 @@ public class DrawInfoServiceImpl implements IDrawInfoService @Override public int deleteDrawInfoByIds(String ids) { - return drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids)); + DrawInfo drawInfo = new DrawInfo(); + String[] string = ids.split(","); + List code = Arrays.asList(string); + drawInfo.setDrawId(code); + //根据ID查询抽奖活动信息 + List drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo); + //删除活动管理信息 + int i = drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids)); + List collect = drawInfos.stream().map(DrawInfo::getDRAWCODE).collect(Collectors.toList()); + String policyEndorseNos = String.join(",",collect); + + //根据活动代码删除活动配置信息 + actConfigMapper.deleteActConfigByCode(Convert.toStrArray(policyEndorseNos)); + //根据活动代码删除活动展示内容配置信息 + actPageConfigGuideMapper.deleteActPageConfigGuideByCode(Convert.toStrArray(policyEndorseNos)); + //根据活动代码删除活动配置信息 + actPageConfigSubscribeMapper.deleteActPageConfigSubscribeByCode(Convert.toStrArray(policyEndorseNos)); + //根据活动代码删除活动收集配置信息 + actPageConfigUserinfoMapper.deleteActPageConfigUserinfoByCode(Convert.toStrArray(policyEndorseNos)); + //根据活动代码删除抽奖活动管理信息 + drawRuleMapper.deleteDrawRuleByIdCode(Convert.toStrArray(policyEndorseNos)); + return i; } /** 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..3e0face9f 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 @@ -96,5 +100,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + delete from act_config where act_code in + + #{actCode} + + \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml index 87a21a128..67e3f8947 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 @@ -96,5 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + delete from act_page_config_guide where act_code in + + #{actCode} + + + \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml index c1166a1d2..3c7f1e1eb 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 @@ -76,5 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + delete from act_page_config_subscribe where act_code in + + #{actCode} + + \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml index 896623315..70b0a1a51 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 @@ -131,5 +135,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + delete from act_page_config_userinfo where act_code in + + #{actCode} + + \ 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 index 6689c1e38..20a7d5423 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" - - - - - - - - - - - @@ -39,7 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml index 713835536..5e7586e88 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml @@ -15,10 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select PRIZEID, PRIZECODE, PRIZENAME, PRIZETYPE, PRIZEVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, INTEGRALPROJECTCODE from draw_prize_info + select PRIZEID, PRIZECODE, PRIZENAME, PRIZETYPE, PRIZEVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, INTEGRALPROJECTCODE, PRIZEIMG from draw_prize_info - + + insert into draw_rule @@ -110,5 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{DRAWRULEID} + + delete from draw_rule where DRAWCODE in + + #{drawCode} + + + \ 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 index 1b20ebfd3..c9f48c98a 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -15,8 +15,8 @@ .leftarea { float: left; - width: 50%; - height: 300px; + width: 60%; + height: 500px; } .sw > .tab-content { @@ -140,21 +140,19 @@ /* 配置分享信息*/ .drawShareTitlePri { - text-align: center; position: absolute; - top: 40%; + top: 45%; font-size: 20px; - left: 28%; + left: 73%; color: #F00; width: 100%; } .drawShareDescribePri { - text-align: center; position: absolute; top: 50%; font-size: 10px; - left: 25%; + left: 73%; color: #F00; width: 100%; } @@ -162,9 +160,9 @@ .drawShareImgPic { text-align: center; position: absolute; - top: 50%; + top: 52%; font-size: 37px; - left: 35%; + left: 38%; color: #F00; width: 100%; } @@ -317,12 +315,14 @@

第2步-选择UI模板

- +
-

- +

暂不选择

+
@@ -444,13 +444,15 @@

第4步-选择玩法

- +
- +

活动规则

-
+ -
- -
-
-
- -
- +
+
+
+ +
+ +
-
-
-
- -
- -
-
-
-
-
-
-
- -
-
- - +
+
+ +
+
-
-
- -
-
- - +
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
-
- - -
-
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
-
-
- -
- -
-
-
-
- -
-
-
- -
- +
+
+
+ +
+ +
-
+

第五步-配置收集信息

@@ -600,9 +599,8 @@
- +
@@ -784,9 +782,8 @@
- +
@@ -814,7 +811,7 @@

效果图

- +
@@ -940,10 +937,7 @@ }); - function submitHandler() { - var data = $("#form-info-add").serializeArray(); - $.operate.saveModal(prefix + "/add", data); - } + //时间段抽奖配置 function dailyflag() { @@ -1035,24 +1029,16 @@ .on('click', function () { //添加保存逻辑 var data = customSerialize("form-info-add", true); - alert(data); $.ajax({ url: prefix + "/add", data: data, type: "post", contentType: "application/json;charset=UTF-8", success: function (result) { - if (result.code == web_status.SUCCESS) { - layer.msg("保存成功,正在刷新数据请稍后……", { - icon: 1, - time: 500, - shade: [0.1, '#8F8F8F'] - }, function () { - location.reload(); - }); - } else { - alert(result.msg); + if (typeof callback == "function") { + callback(result); } + $.operate.successTabCallback(result); } }) }); @@ -1223,6 +1209,11 @@ $("#"+id+"val").val(valus); $("#"+id+"h4").text(val.text); $("#"+id+"img").attr("src",path+valus+".jpg"); + if (valus != "0"){ + $("#activityPlaydiv").css('display','block');//显示 + }else{ + $("#activityPlaydiv").css('display','none');//隐藏 + } } 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/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html new file mode 100644 index 000000000..06450c258 --- /dev/null +++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html @@ -0,0 +1,1251 @@ + + + + + + + + + + +
+
+ + +
+ +
+
+
+ +

第1步-基本信息

+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+ +
+
+
+
+

第2步-选择UI模板

+
+ + +
+ +

暂不选择

+ +
+
+
+
+
+

第3步-配置展现内容

+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+ 选择图片更改 + + 清除 +
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+

效果图

+
+ + 活动标题 + 活动描述 + + 自定义按钮1 + + + 自定义按钮2 + +
+
+
+
+
+

第4步-选择玩法

+
+ + +
+ + +

活动规则

+ +
+
+
+
+

第五步-配置收集信息

+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+ 选择图片更改 + + 清除 + +
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ + +
+

效果图

+
+ + 标题 + 描述 + 请填写您的基本信息 +
+ + 信息页文本协议提示 +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + 自定义按钮 + +
+
+ +
+
+
+
+
+

第六步-配置分享信息

+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+ 选择图片更改 + + 清除 +
+
+ +
+
+
+
+

效果图

+
+
+ +
+
+ +
+
+ 中国人寿举办活动 +
+ 分享必得奖品 + +
+
+
+
+
+
+
+

第七步-关注二维码

+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+
+ 选择图片更改 + + 清除 +
+
+
+ +
+
+
+ +
+
+
+ 选择图片更改 + + 清除 +
+
+
+ +
+
+
+

效果图

+
+ +
+ +
+ + 关注二维码 + +
+
+
+
+ +
+
+ +
+ + + + + + + + + \ 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 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 @@ 添加 - + 修改 diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html index 4695d72b5..9a99a2a4e 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html @@ -3,6 +3,7 @@ +
@@ -34,6 +35,24 @@
+
+ +
+
+
+ +
+
+ +
@@ -81,6 +100,7 @@
+ \ No newline at end of file