diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index c7d8dc453..48d7c913e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -2,6 +2,7 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -97,7 +98,7 @@ public class WxActivityController extends BaseController { public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxActivityController::findById"); WxActivity wxActivity = wxActivityService.getById(id); - return new ResultData(Result.SUCCESS, "查询成功", wxActivity); + return new ResultData(wxActivity); } @ApiOperation("投放到宣传页") @@ -117,4 +118,15 @@ public class WxActivityController extends BaseController { return wxActivityService.offLineCampaign(wxActivity); } + @ApiOperation("删除") + @PostMapping("deleteById") + @SystemControllerLog(description = "活动-删除") + public ResultData deleteById(@RequestBody WxActivity wxActivity) { + logger.debug("[" + getIpAddr() + "] WxActivityController::deleteById"); + if(wxActivity.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + return wxActivityService.deleteById(wxActivity.getId(),getTenantInfo().getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java index 14316d486..16bfd0121 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxActivity; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +18,6 @@ public interface WxActivityMapper extends CommonMapper { void activityExipred(WxActivity activity); void activityCompletion(WxActivity activity); + + int deleteById(@Param("id")Long id, @Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java index 8a2ad98c4..6b6cbb110 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -53,4 +53,6 @@ public interface WxActivityService { Integer queryActivityStatus(Long id); Integer queryJoinStatus(Long id, Long memberId); + + ResultData deleteById(Long id,String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 072e17b98..3cb4b98f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -422,5 +422,19 @@ public class WxActivityServiceImpl implements WxActivityService { } + @Override + public ResultData deleteById(Long id, String tenantId) { + WxActivity wxActivity = wxActivityMapper.selectById(id); + if(wxActivity == null){ + return new ResultData(ErrorCode.ACTIVITY_NOT_FOND); + } + if(EnumActivityStatus.INJECT_CAMPAIGN.getCode().equals(wxActivity.getStatus()) + || EnumActivityStatus.INJECT_ONLINE.getCode().equals(wxActivity.getStatus())){ + return new ResultData(ErrorCode.ACTIVITY_NOT_UPDATE.getCode(),"该状态不允许删除"); + } + wxActivityMapper.deleteById(id,tenantId); + return new ResultData(); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 7cdf59a4d..0662d59d3 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -39,7 +39,7 @@ - where 1 = 1 + where `is_del` = 0 and `id` = #{id} @@ -149,5 +149,9 @@ update wx_activity set status=#{status},update_time=#{updateTime} where status!=${status} and now()>activity_end_time + + update wx_activity set is_del = 1, update_date=now() where id = #{id} + +