From 376a461ec05fe958fc575bba5786d7bf5d489a59 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Mon, 12 Apr 2021 16:15:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DrawInfoController.java | 26 +++++---- .../activity/mapper/DrawRuleMapper.java | 2 +- .../activity/service/IDrawInfoService.java | 2 + .../service/impl/DrawInfoServiceImpl.java | 53 +++++++++++++++++-- .../mapper/activity/ActConfigMapper.xml | 3 +- .../activity/ActPageConfigGuideMapper.xml | 3 +- .../activity/ActPageConfigSubscribeMapper.xml | 3 +- .../activity/ActPageConfigUserinfoMapper.xml | 3 +- .../mapper/activity/DrawRuleMapper.xml | 3 +- 9 files changed, 74 insertions(+), 24 deletions(-) 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 bfd8bb05d..19d4df37b 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 @@ -188,16 +188,20 @@ public class DrawInfoController extends BaseController @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(DrawInfo drawInfo) - { - logger.info("修改存储抽奖特殊规则对象传参："+JSON.toJSONString(drawInfo)); - drawInfo.setLASTUPDATETIMESTAMP(new Date()); - drawInfoService.updateDrawInfo(drawInfo); - DrawRule drawRule = new DrawRule(); - BeanUtils.copyProperties(drawInfo,drawRule); - logger.info("修改存储抽奖特殊规则对象入参："+JSON.toJSONString(drawRule)); - int i = iDrawRuleService.updateDrawRule(drawRule); - return toAjax(i); + public AjaxResult editSave(ActVO vo) + { + try{ + logger.info("前台传参"+ JSON.toJSONString(vo)); + Date date = new Date(); + + int i = drawInfoService.updateActVO(vo); + 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)); } 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 b2c8bee51..65a8e6ac8 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 @@ -70,5 +70,5 @@ public interface DrawRuleMapper * 根据活动代码删除抽奖活动管理信息 * @param toStrArray */ - public void deleteDrawRuleByIdCode(String[] toStrArray); + public int deleteDrawRuleByIdCode(String[] toStrArray); } 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 206d1656b..1e2029118 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 @@ -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; @@ -68,4 +69,5 @@ public interface IDrawInfoService public int deleteDrawInfoById(String DRAWID); + public int updateActVO(ActVO vo); } 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 1401908e1..e4ca30f39 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,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 drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo); //删除活动管理信息 - int i = drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids)); + drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids)); List 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,48 @@ public class DrawInfoServiceImpl implements IDrawInfoService { return drawInfoMapper.deleteDrawInfoById(DRAWID); } + + @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; + } } diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml index 3e0face9f..0b311ab89 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml @@ -78,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" page_style = #{pageStyle}, act_type = #{actType}, - act_code = #{actCode}, act_name = #{actName}, share_title = #{shareTitle}, share_desc = #{shareDesc}, @@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_time = #{updateTime}, - where id = #{id} + where act_code = #{actCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml index 67e3f8947..477e9ec77 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml @@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update act_page_config_guide - act_code = #{actCode}, act_title = #{actTitle}, act_desc = #{actDesc}, bg_img = #{bgImg}, @@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_time = #{updateTime}, - where id = #{id} + where act_code = #{actCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml index 3c7f1e1eb..4740574fd 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml @@ -60,14 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update act_page_config_subscribe - act_code = #{actCode}, description = #{description}, bg_img = #{bgImg}, qr_code = #{qrCode}, create_time = #{createTime}, update_time = #{updateTime}, - where id = #{id} + where act_code = #{actCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml index 70b0a1a51..d088c24dd 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml @@ -104,7 +104,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update act_page_config_userinfo - act_code = #{actCode}, title = #{title}, description = #{description}, bg_img = #{bgImg}, @@ -122,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_time = #{updateTime}, - where id = #{id} + where act_code = #{actCode} diff --git a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml index d06ff8e6b..dc97d0a9a 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml @@ -89,7 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update draw_rule - DRAWCODE = #{DRAWCODE}, FIRSTFLAG = #{FIRSTFLAG}, FIRSTAWARDPRIZE = #{FIRSTAWARDPRIZE}, DAILYFLAG = #{DAILYFLAG}, @@ -102,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}, WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER}, - where DRAWRULEID = #{DRAWRULEID} + where DRAWCODE = #{DRAWCODE}