From 616cf4709d4a8aed8e5a290cd85f93a525fb8e74 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Mon, 12 Apr 2021 14:24:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActConfigMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml index 000343a8a..10bc8221d 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where act_code = #{drawCode} From 9ca96f647de51056125f51c6e757828546f85448 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Mon, 12 Apr 2021 14:28:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActConfigMapper.xml | 2 +- .../main/resources/mapper/activity/ActPageConfigGuideMapper.xml | 2 +- .../resources/mapper/activity/ActPageConfigSubscribeMapper.xml | 2 +- .../resources/mapper/activity/ActPageConfigUserinfoMapper.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml index 10bc8221d..398aafdfc 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where act_code = #{drawCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml index 0ca0e7386..112f0fd23 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where act_code = #{drawCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml index 27c0ed19e..0b4753c3d 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where act_code = #{drawCode} diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml index dbc078e1e..940ce03ff 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where act_code = #{drawCode} From 95e26a93a4651f28789d965fe7bb46cf31fc3495 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Mon, 12 Apr 2021 15:38:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sinosoft/activity/domain/DrawInfo.java | 10 +++++ .../activity/mapper/ActConfigMapper.java | 6 +++ .../mapper/ActPageConfigGuideMapper.java | 6 +++ .../mapper/ActPageConfigSubscribeMapper.java | 6 +++ .../mapper/ActPageConfigUserinfoMapper.java | 6 +++ .../activity/mapper/DrawRuleMapper.java | 6 +++ .../service/impl/DrawInfoServiceImpl.java | 40 +++++++++++++++++-- .../mapper/activity/ActConfigMapper.xml | 6 +++ .../activity/ActPageConfigGuideMapper.xml | 7 ++++ .../activity/ActPageConfigSubscribeMapper.xml | 6 +++ .../activity/ActPageConfigUserinfoMapper.xml | 6 +++ .../mapper/activity/DrawInfoMapper.xml | 8 +++- .../mapper/activity/DrawRuleMapper.xml | 7 ++++ 13 files changed, 116 insertions(+), 4 deletions(-) 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/mapper/ActConfigMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java index 1d6416482..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 @@ -64,4 +64,10 @@ public interface ActConfigMapper * @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 2dfaa8e2d..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 @@ -64,4 +64,10 @@ public interface ActPageConfigGuideMapper * @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 b2eb752db..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 @@ -64,4 +64,10 @@ public interface ActPageConfigSubscribeMapper * @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 dae8139c5..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 @@ -64,4 +64,10 @@ public interface ActPageConfigUserinfoMapper * @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 4b039bc9e..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 @@ -65,4 +65,10 @@ public interface DrawRuleMapper * @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/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/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml index 398aafdfc..3e0face9f 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml @@ -100,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 112f0fd23..67e3f8947 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml @@ -100,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 0b4753c3d..3c7f1e1eb 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml @@ -80,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 940ce03ff..70b0a1a51 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml @@ -135,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 ae7fcc7a4..20a7d5423 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml @@ -28,7 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select dpi.* from draw_prize_info dpi left join draw_config dc on dpi.prizecode=dc.prizecode + + and DRAWCODE = #{DRAWCODE} + and PRIZECODE = #{PRIZECODE} + and STATUS = #{STATUS} + +