diff --git a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java index c7eee458..d96f72a6 100644 --- a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java +++ b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java @@ -34,6 +34,7 @@ public class AppApiMethodAspect { //请求的参数 Object[] args = pjp.getArgs(); String params = new Gson().toJson(args); + String resultJson = new Gson().toJson(result); //获取request HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); @@ -41,10 +42,10 @@ public class AppApiMethodAspect { // String className = pjp.getTarget().getClass().getName(); String methodName = signature.getName(); - log.info("\n>>>>>>{} {}\n>>>>>>{}\n>>>>>>Request: {}\n>>>>>>Response: {}" - , methodName, request.getRequestURL(), IPUtils.getIpAddr(request), + log.info("\n {}\n>>>>>>{}\n>>>>>>Request: {}\n>>>>>>Response: {}" + , request.getRequestURL(), IPUtils.getIpAddr(request), params, - result + resultJson ); return result; } diff --git a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java index bf4770c2..134a8d7a 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java @@ -11,27 +11,33 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/moneyDetails") +@RequestMapping @AllArgsConstructor -@Api("钱包明细") +@Api(value = "钱包明细", tags = {"钱包明细"}) public class UserMoneyDetailsController { private UserMoneyDetailsService userMoneyDetailsService; private UserMoneyService userMoneyService; @ApiOperation("钱包明细") - @GetMapping("/queryUserMoneyDetails") + @GetMapping("/moneyDetails/queryUserMoneyDetails") public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type) { return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type); } - @GetMapping("/selectUserMoney") + @GetMapping("/moneyDetails/selectUserMoney") @ApiOperation("我的钱包") public Result selectUserMoney(Long userId){ return Result.success().put("data",userMoneyService.selectUserMoneyByUserId(userId)); } - @GetMapping("/selectSysUserMoney") + @GetMapping("/app/moneyDetails/selectUserMoney") + @ApiOperation("我的钱包 app版本") + public Result selectAppUserMoney(Long userId){ + return Result.success().put("data",userMoneyService.selectUserMoneyByUserId(userId)); + } + + @GetMapping("/moneyDetails/selectSysUserMoney") @ApiOperation("代理钱包") public Result selectSysUserMoney(Long userId){ return Result.success().put("data",userMoneyService.selectSysUserMoneyByUserId(userId)); diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java index 2484457e..0f4532a4 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java @@ -1,20 +1,17 @@ package com.sqx.modules.discSpinning.controller; -import com.sqx.modules.discSpinning.entity.DiscSpinningRecord; -import com.sqx.modules.discSpinning.service.DiscSpinningRecordService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.Result; +import com.sqx.modules.discSpinning.entity.DiscSpinningRecord; +import com.sqx.modules.discSpinning.service.DiscSpinningRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Date; - @Slf4j @RestController @Api(value = "大转盘抽奖记录", tags = {"大转盘抽奖记录"}) @@ -34,8 +31,8 @@ public class DiscSpinningRecordController { @GetMapping("/selectDiscSpinningRecord") @ApiOperation("查询大转盘抽奖记录") - public Result selectDiscSpinningRecord(Integer page, Integer limit) { - return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper().orderByAsc("create_time"))); + public Result selectDiscSpinningRecord(Integer page, Integer limit,@RequestAttribute("userId") Long userId) { + return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper().eq("user_id",userId).orderByAsc("create_time"))); } }