diff --git a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java index c9cb6382..cf9b4196 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java @@ -1,5 +1,7 @@ package com.peanut.modules.common.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; @@ -8,6 +10,7 @@ import com.peanut.modules.common.entity.UserContribution; import com.peanut.modules.master.service.UserContributionService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -46,13 +49,13 @@ public class UserContributionController { //分类下湖分明细 @RequestMapping("/getUserContributionByType") - public R getUserContributionByType(String type){ - Integer userId = 785; - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.eq("user_id",userId); - wrapper.eq("type",type); - wrapper.orderByDesc("create_time"); - List contributions = contributionService.listMaps(wrapper); + public R getUserContributionByType(@RequestBody Map params){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(UserContribution::getUserId,ShiroUtils.getUId()); + wrapper.eq(UserContribution::getType,params.get("type")); + wrapper.orderByDesc(UserContribution::getCreateTime); + Page contributions = contributionService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); return R.ok().put("list",contributions); } }