liujunchi 3 年之前
父节点
当前提交
e241c48a5a

+ 3 - 2
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityUserRewardController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,8 +41,8 @@ public class ActivityUserRewardController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入activityUserRewardSearch")
-    public HttpResponseResult<PageInfo<ActivityUserRewardVo>> page(@RequestBody @Valid ActivityUserRewardSearch query) {
-		IPage<ActivityUserRewardVo> pages = activityUserRewardService.selectPage(PageUtil.getPage(query), query);
+    public HttpResponseResult<PageInfo<UserRewardVo>> page(@RequestBody @Valid ActivityUserRewardSearch query) {
+		IPage<UserRewardVo> pages = activityUserRewardService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
 }

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityUserRewardDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
 import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
@@ -25,6 +26,6 @@ public interface ActivityUserRewardDao extends BaseMapper<ActivityUserReward>{
      * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
 	 */
-	List<ActivityUserRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserRewardSearch activityUserReward);
+	List<UserRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserRewardSearch activityUserReward);
 	
 }

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityUserRewardService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 
 /**
  * 活动用户获奖表 服务类
@@ -25,5 +26,5 @@ public interface ActivityUserRewardService extends IService<ActivityUserReward>
      * @author liweifan
  	 * @date 2022-08-04
      */
-    IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query);
+    IPage<UserRewardVo> selectPage(IPage<UserRewardVo> page, ActivityUserRewardSearch query);
 }

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityUserRewardServiceImpl.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
     }
     
     @Override
-    public IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query){
+    public IPage<UserRewardVo> selectPage(IPage<UserRewardVo> page, ActivityUserRewardSearch query){
         return page.setRecords(baseMapper.selectPage(page, query));
     }