diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/RafflePrizeActivityUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/RafflePrizeActivityUserQueryController.java index 48463c5..74e4359 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/RafflePrizeActivityUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/RafflePrizeActivityUserQueryController.java @@ -1,7 +1,7 @@ package com.qniao.dam.api.query.rpa.user; import com.qniao.dam.api.query.rpa.user.request.UserPageRafflePrizeActivityQueryParams; -import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailVo; +import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailyByOperatorVo; import com.qniao.dam.api.query.rpa.user.response.UserPageRafflePrizeActivityByOperatorVo; import com.qniao.dam.query.rpa.RafflePrizeActivityQueryService; import com.qniao.domain.QnPage; @@ -30,9 +30,9 @@ public class RafflePrizeActivityUserQueryController { return PageUtil.convert(rafflePrizeActivityQueryService.pageByOperator(queryParams, pageUtil), UserPageRafflePrizeActivityByOperatorVo.class); } - @GetMapping("get/raffle-prize-activity/detail") + @GetMapping("get/raffle-prize-activity/detail/by/operator") @ApiOperation("运营端获取抽奖奖品配置分页") - public UserGetRafflePrizeActivityDetailVo userGetRafflePrizeActivityDetail(@RequestParam("id") Long id) { - return rafflePrizeActivityQueryService.getDetail(id); + public UserGetRafflePrizeActivityDetailyByOperatorVo userGetRafflePrizeActivityDetailByOperator(@RequestParam("id") Long id) { + return rafflePrizeActivityQueryService.getDetailByOperator(id); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java similarity index 95% rename from dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailVo.java rename to dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java index c822f18..a81c40f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; import java.util.List; @Data -public class UserGetRafflePrizeActivityDetailVo { +public class UserGetRafflePrizeActivityDetailyByOperatorVo { @ApiModelProperty("唯一标识") @JsonSerialize(using = ToStringSerializer.class) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/RafflePrizeActivityQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/RafflePrizeActivityQueryService.java index 38e32ba..2903b83 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/RafflePrizeActivityQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/RafflePrizeActivityQueryService.java @@ -2,7 +2,7 @@ package com.qniao.dam.query.rpa; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.rpa.user.request.UserPageRafflePrizeActivityQueryParams; -import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailVo; +import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailyByOperatorVo; import com.qniao.dam.api.query.rpa.user.response.UserPageRafflePrizeActivityByOperatorVo; import com.qniao.framework.utils.PageUtil; @@ -10,5 +10,5 @@ public interface RafflePrizeActivityQueryService { IPage pageByOperator(UserPageRafflePrizeActivityQueryParams queryParams, PageUtil pageUtil); - UserGetRafflePrizeActivityDetailVo getDetail(Long id); + UserGetRafflePrizeActivityDetailyByOperatorVo getDetailByOperator(Long id); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java index 49d0844..3a50241 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java @@ -2,7 +2,7 @@ package com.qniao.dam.query.rpa.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.rpa.user.request.UserPageRafflePrizeActivityQueryParams; -import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailVo; +import com.qniao.dam.api.query.rpa.user.response.UserGetRafflePrizeActivityDetailyByOperatorVo; import com.qniao.dam.api.query.rpa.user.response.UserPageRafflePrizeActivityByOperatorVo; import com.qniao.dam.domain.aggregate.rpa.entity.RafflePrizeActivity; import com.qniao.dam.infrastructure.persistent.dao.rpa.RafflePrizeActivityDao; @@ -27,11 +27,11 @@ public class RafflePrizeActivityQueryServiceImpl implements RafflePrizeActivityQ } @Override - public UserGetRafflePrizeActivityDetailVo getDetail(Long id) { - UserGetRafflePrizeActivityDetailVo detailVo = new UserGetRafflePrizeActivityDetailVo(); + public UserGetRafflePrizeActivityDetailyByOperatorVo getDetailByOperator(Long id) { + UserGetRafflePrizeActivityDetailyByOperatorVo detailVo = new UserGetRafflePrizeActivityDetailyByOperatorVo(); RafflePrizeActivity rafflePrizeActivity = rafflePrizeActivityDao.selectById(id); if (Objects.nonNull(rafflePrizeActivity)) { - detailVo = TypeConvertUtils.convert(rafflePrizeActivity, UserGetRafflePrizeActivityDetailVo.class); + detailVo = TypeConvertUtils.convert(rafflePrizeActivity, UserGetRafflePrizeActivityDetailyByOperatorVo.class); detailVo.setItemList(rafflePrizeActivityDao.listItemVo(id)); } return detailVo;