diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 457e3cc..160e2b9 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -5,13 +5,19 @@ import com.example.demo.domain.entity.Detail; import com.example.demo.domain.vo.DetailVo; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.UserVo; import com.example.demo.serviceImpl.ConsumeServiceImpl; +import com.example.demo.serviceImpl.UserServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; + +import static java.lang.Integer.parseInt; + @RestController @RequestMapping("/consume") //SpringMVC的,为当前类的所有处理器方法,添加路径映射的前缀 @@ -22,6 +28,9 @@ import org.springframework.web.bind.annotation.*; public class ConsumeController { @Autowired ConsumeServiceImpl consumeService; + @Autowired + UserServiceImpl userService; + @PostMapping("/add") // public Result add(@RequestParam("userId") Integer userId, @RequestBody Detail detail){ public Result add(@RequestBody Detail detail) throws Exception { @@ -59,8 +68,16 @@ public class ConsumeController { @PostMapping("/getDeatil/{jwcode}") public Result getDeatil(@PathVariable("jwcode") Integer jwcode){ - - return Result.success(consumeService.getDeatil(jwcode)); + try{ + UserVo userVo=new UserVo(); + userVo.setJwcode(jwcode.toString()); + userService.search(userVo); + System.out.println("======================"+userVo); + return Result.success(consumeService.getDeatil(jwcode)); + }catch (Exception e) { + log.error(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } } @PostMapping("/getProduct") diff --git a/src/main/java/com/example/demo/controller/StatisticsController.java b/src/main/java/com/example/demo/controller/StatisticsController.java index 15538be..a197f91 100644 --- a/src/main/java/com/example/demo/controller/StatisticsController.java +++ b/src/main/java/com/example/demo/controller/StatisticsController.java @@ -3,12 +3,16 @@ package com.example.demo.controller; import com.example.demo.domain.vo.Result; import com.example.demo.domain.vo.Statistics; +import com.example.demo.domain.vo.UserVo; +import com.example.demo.serviceImpl.UserServiceImpl; import com.example.demo.sevice.StatisticsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; + @RestController @RequestMapping("/statistics") @@ -18,6 +22,9 @@ import org.springframework.web.bind.annotation.*; public class StatisticsController { @Autowired private final StatisticsService statisticsService; + @Autowired + UserServiceImpl userService; + @PostMapping("/a") public Result count() { @@ -56,7 +63,15 @@ public class StatisticsController { @PostMapping("/getMess/{jwcode}") public Result getMess(@PathVariable("jwcode") Integer jwcode){ - return Result.success(statisticsService.getMess(jwcode)); + try { + UserVo userVo=new UserVo(); + userVo.setJwcode(jwcode.toString()); + userService.search(userVo); + return Result.success(statisticsService.getMess(jwcode)); + }catch (Exception e){ + log.error(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } } @PostMapping("/getMediumAreaPay") diff --git a/src/main/java/com/example/demo/domain/vo/UserVo.java b/src/main/java/com/example/demo/domain/vo/UserVo.java index f2e485a..956751b 100644 --- a/src/main/java/com/example/demo/domain/vo/UserVo.java +++ b/src/main/java/com/example/demo/domain/vo/UserVo.java @@ -19,4 +19,6 @@ public class UserVo { private Integer pendingRechargeTimes; private Integer pendingSpendTimes; private Integer sumgold; + + } diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index ed54eb8..c66b173 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -55,6 +55,7 @@ public interface ConsumeMapper { "and detail.create_time between #{searchStartTime} and #{searchEndTime}", "", "", + "ORDER BY detail.create_time DESC", "" }) List select(DetailVo detailVo); diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java index 7e1a87f..bfb10f3 100644 --- a/src/main/java/com/example/demo/mapper/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java @@ -46,6 +46,7 @@ public interface RechargeMapper { "and area like concat('%',#{area},'%')", "and audit.status=#{status}", "", + "ORDER BY recharge.create_time DESC", "" }) List select(RechargeVo rechargeVo); diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java index 1e0517b..060094c 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/RefundMapper.java @@ -61,6 +61,7 @@ public interface RefundMapper { "AND u.name LIKE CONCAT('%', #{userName}, '%')", // user表字段过滤 "AND au.status = #{auditStatus}", // audit 表字段过滤 "AND au.reson LIKE CONCAT('%', #{auditReson}, '%')", // audit表字段过滤 + "ORDER BY d.create_time DESC", "" }) List select(Detail detail);