diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java index 5c6911c..cdf1a45 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java @@ -1,6 +1,7 @@ package com.qniao.dam.api.command.activity.user; import com.qniao.dam.api.command.activity.user.request.ActivityDto; +import com.qniao.dam.api.command.activity.user.request.ChangeActivityDto; import com.qniao.dam.application.service.activity.ActivityApplicationService; import com.qniao.dam.domain.aggregate.activity.entity.Activity; import io.swagger.annotations.Api; @@ -26,4 +27,10 @@ public class ActivityUserCommandController { Activity activity = activityDto.trans2Domain(); return activityApplicationService.saveActivity(activity); } + + @ApiOperation("变更活动启停") + @PostMapping("change/activity/stat/stop") + public String changeActivityStatStop(@RequestBody ChangeActivityDto changeActivityDto){ + return activityApplicationService.changeActivityStatStop(changeActivityDto); + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ChangeActivityDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ChangeActivityDto.java new file mode 100644 index 0000000..181fead --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ChangeActivityDto.java @@ -0,0 +1,10 @@ +package com.qniao.dam.api.command.activity.user.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ChangeActivityDto { + @ApiModelProperty("活动id") + private Long id; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/activity/user/request/ActivityQueryDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/activity/user/request/ActivityQueryDto.java index 5390fd0..39204dd 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/activity/user/request/ActivityQueryDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/activity/user/request/ActivityQueryDto.java @@ -1,7 +1,14 @@ package com.qniao.dam.api.query.activity.user.request; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ActivityQueryDto { + + @ApiModelProperty("活动标题") + private String activityName; + + @ApiModelProperty("活动状态 0 未开始 1 进行中 2 已结束") + private Integer activeState; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java index 941fa65..06039cc 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java @@ -1,6 +1,7 @@ package com.qniao.dam.application.service.activity; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.qniao.dam.api.command.activity.user.request.ChangeActivityDto; import com.qniao.dam.api.query.activity.user.request.ActivityQueryDto; import com.qniao.dam.api.query.activity.user.response.ActivityDetailsVo; import com.qniao.dam.api.query.activity.user.response.ActivityProductListVo; @@ -9,6 +10,7 @@ import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQue import com.qniao.dam.domain.aggregate.activity.ActivityAggregate; import com.qniao.dam.domain.aggregate.activity.entity.Activity; import com.qniao.dam.domain.aggregate.activity.entity.ActivityProduct; +import com.qniao.dam.domian.aggregate.activity.constant.ActivityStatusEnum; import com.qniao.dam.infrastructure.persistent.dao.activity.ActivityDao; import com.qniao.dam.infrastructure.persistent.dao.activity.ActivityProductDao; import com.qniao.dam.infrastructure.persistent.dao.view.ProductViewDao; @@ -19,6 +21,7 @@ import com.qniao.framework.utils.PageUtil; import com.qniao.framework.utils.TypeConvertUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; import java.util.ArrayList; @@ -77,5 +80,14 @@ public class ActivityApplicationService extends BaseApplicationService { return vo; } + public String changeActivityStatStop(@RequestBody ChangeActivityDto changeActivityDto){ + Activity activity = activityDao.selectById(changeActivityDto.getId()); + if(activity.getStatus() == ActivityStatusEnum.ENABLE.getValue().intValue()){ + activity.setStatus(ActivityStatusEnum.DISABLE.getValue()); + }else{ + activity.setStatus(ActivityStatusEnum.ENABLE.getValue()); + } + return activity.getId().toString(); + } } diff --git a/dating-agency-mall-server/src/main/resources/mapper/activity/ActivityMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/activity/ActivityMapper.xml index 3d76730..91f1399 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/activity/ActivityMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/activity/ActivityMapper.xml @@ -11,5 +11,18 @@ -1 END activeState FROM da_activity + WHERE is_delete = 0 + + AND activity_name LIKE CONCAT('%', TRIM(#{dto.activityName}),'%') + + + AND start_time > NOW() AND end_time > NOW() + + + AND start_time <= NOW() AND end_time >= NOW() + + + AND start_time < NOW() AND end_time < NOW() + diff --git a/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml index bf77102..1c814cf 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml @@ -93,7 +93,7 @@ LEFT JOIN da_product_spec_term as dpst2 on dpst2.is_delete=0 and dpst2.product_spec_id =ps.id and dpst2.`name`=3 LEFT JOIN da_product_spec_term as dpst3 on dpst3.is_delete=0 and dpst3.product_spec_id =ps.id and dpst3.`name`=2 LEFT JOIN da_product_spec_term as dpst4 on dpst4.is_delete=0 and dpst4.product_spec_id =ps.id and dpst4.`name`=4 - WHERE a.is_delete = 0 AND a.start_time <= NOW() AND a.end_time >= NOW() + WHERE a.is_delete = 0 AND a.status = 1 AND a.start_time <= NOW() AND a.end_time >= NOW() UNION select 0 groupType,