diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java index 95b48e5..ebc4269 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/AuditController.java @@ -3,6 +3,7 @@ package com.example.demo.controller; import com.example.demo.domain.entity.Audit; import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; @@ -22,6 +23,8 @@ import java.time.LocalDate; import java.time.Month; import java.util.Arrays; +import static com.example.demo.Util.JWTUtil.getUserDetails; + @RestController @RequestMapping("/audit/audit") @RequiredArgsConstructor diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java index 5200be6..e0766d9 100644 --- a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java +++ b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java @@ -45,5 +45,6 @@ public class ConsumeDetail { private String token; private Integer refundId; private String productName; + private String username; } diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index 674c534..8654d17 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -45,7 +45,7 @@ public interface ConsumeMapper { //模糊分页查询,查询消费明细 @Select({ "