| @@ -2,6 +2,7 @@ package com.iformall.controller.market; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| @@ -97,7 +98,7 @@ public class WxActivityController extends BaseController { | |||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxActivityController::findById"); | logger.debug("[" + getIpAddr() + "] WxActivityController::findById"); | ||||
| WxActivity wxActivity = wxActivityService.getById(id); | WxActivity wxActivity = wxActivityService.getById(id); | ||||
| return new ResultData(Result.SUCCESS, "查询成功", wxActivity); | |||||
| return new ResultData(wxActivity); | |||||
| } | } | ||||
| @ApiOperation("投放到宣传页") | @ApiOperation("投放到宣传页") | ||||
| @@ -117,4 +118,15 @@ public class WxActivityController extends BaseController { | |||||
| return wxActivityService.offLineCampaign(wxActivity); | 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()); | |||||
| } | |||||
| } | } | ||||
| @@ -2,6 +2,7 @@ package com.iformall.mapper; | |||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxActivity; | import com.iformall.domain.po.WxActivity; | ||||
| import org.apache.ibatis.annotations.Param; | |||||
| import java.util.List; | import java.util.List; | ||||
| @@ -17,4 +18,6 @@ public interface WxActivityMapper extends CommonMapper<WxActivity, Long> { | |||||
| void activityExipred(WxActivity activity); | void activityExipred(WxActivity activity); | ||||
| void activityCompletion(WxActivity activity); | void activityCompletion(WxActivity activity); | ||||
| int deleteById(@Param("id")Long id, @Param("tenantId")String tenantId); | |||||
| } | } | ||||
| @@ -53,4 +53,6 @@ public interface WxActivityService { | |||||
| Integer queryActivityStatus(Long id); | Integer queryActivityStatus(Long id); | ||||
| Integer queryJoinStatus(Long id, Long memberId); | Integer queryJoinStatus(Long id, Long memberId); | ||||
| ResultData deleteById(Long id,String tenantId); | |||||
| } | } | ||||
| @@ -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(); | |||||
| } | |||||
| } | } | ||||
| @@ -39,7 +39,7 @@ | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| where 1 = 1 | |||||
| where `is_del` = 0 | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and `id` = #{id} | 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 status=#{status},update_time=#{updateTime} where status!=${status} and now()>activity_end_time | ||||
| </update> | </update> | ||||
| <delete id="deleteById" parameterType="Long"> | |||||
| update wx_activity set is_del = 1, update_date=now() where id = #{id} | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||