diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/platformData/PlatformData.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/platformData/PlatformData.java index 86b864b..54c332d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/platformData/PlatformData.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/platformData/PlatformData.java @@ -7,6 +7,7 @@ import com.mcwl.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,7 +25,7 @@ public class PlatformData { * 今日收益总额 */ @ApiOperation(value = "今日收益总额") - @RequestMapping("getTodayIncome") + @GetMapping("getTodayIncome") public R getTodayIncome() { Double amount = orderTradeService.getTodayIncome(); return R.ok(amount); @@ -35,7 +36,7 @@ public class PlatformData { * 本月收益总额 */ @ApiOperation(value = "本月收益总额") - @RequestMapping("getMonthIncome") + @GetMapping("getMonthIncome") public R getMonthIncome() { Double amount = orderTradeService.getMonthIncome(); return R.ok(amount); @@ -45,7 +46,7 @@ public class PlatformData { * 年度收益总额 */ @ApiOperation(value = "年度收益总额") - @RequestMapping("getYearIncome") + @GetMapping("getYearIncome") public R getYearIncome() { Double amount = orderTradeService.getYearIncome(); return R.ok(amount); @@ -55,7 +56,7 @@ public class PlatformData { * 总收益总额 */ @ApiOperation(value = "总收益总额") - @RequestMapping("getTotalIncome") + @GetMapping("getTotalIncome") public R getTotalIncome() { Double amount = orderTradeService.getTotalIncome(); return R.ok(amount); @@ -66,7 +67,7 @@ public class PlatformData { * (本期数-同期数)/同期数×100% */ @ApiOperation(value = "收益同比增长") - @RequestMapping("getYoYTrend") + @GetMapping("getYoYTrend") public R getYoYTrend() { Double yoyTrend = orderTradeService.getYoYTrend(); return R.ok(yoyTrend); @@ -77,7 +78,7 @@ public class PlatformData { * (本期数 - 上期数) / 上期数 × 100% */ @ApiOperation(value = "收益环比增长") - @RequestMapping("getMoMTrend") + @GetMapping("getMoMTrend") public R getMoMTrend() { Double momTrend = orderTradeService.getMoMTrend(); return R.ok(momTrend); @@ -87,7 +88,7 @@ public class PlatformData { * 获取用户数量 */ @ApiOperation(value = "获取用户数量") - @RequestMapping("getUserCount") + @GetMapping("getUserCount") public R getUserCount() { int count = sysUserService.getUserCount(); return R.ok(count); @@ -97,7 +98,7 @@ public class PlatformData { * 本月新增用户数 */ @ApiOperation(value = "本月新增用户数") - @RequestMapping("getMonthUserCount") + @GetMapping("getMonthUserCount") public R getMonthUserCount() { int count = sysUserService.getMonthUserCount(); return R.ok(count); diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java index 5aa3afb..629a513 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java @@ -185,8 +185,10 @@ public class OrderTradeServiceImpl extends ServiceImpl