diff --git a/src/main/java/com/example/building/controller/OrderController.java b/src/main/java/com/example/building/controller/OrderController.java index 2e37418..891f824 100644 --- a/src/main/java/com/example/building/controller/OrderController.java +++ b/src/main/java/com/example/building/controller/OrderController.java @@ -9,8 +9,6 @@ import com.example.building.service.SystemConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import static java.lang.String.defaultString; - import java.util.Map; /** @@ -39,7 +37,7 @@ public class OrderController { public Result createOrder(@RequestBody CreateOrderRequest request, @RequestHeader("X-User-Id") String operatorId, @RequestHeader("X-Username") String operatorName, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { // 顾客角色不允许创建订单 if ("customer".equals(role)) { return Result.error("顾客账号不允许创建订单,请联系销售人员"); @@ -59,7 +57,7 @@ public class OrderController { @RequestParam(required = false) String endDate, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "20") Integer pageSize, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { // 顾客角色:限制时间范围 if ("customer".equals(role) && startDate == null) { @@ -76,7 +74,7 @@ public class OrderController { @GetMapping("/{id}") public Result> getOrderDetail(@PathVariable String id, @RequestHeader("X-User-Id") String userId, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { return Result.success(orderService.getOrderDetail(id, userId, role)); } @@ -86,7 +84,7 @@ public class OrderController { @PutMapping("/{id}/cancel") public Result cancelOrder(@PathVariable String id, @RequestHeader("X-User-Id") String operatorId, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { // 顾客不能取消订单 if ("customer".equals(role)) { return Result.error("顾客账号不允许取消订单"); @@ -101,7 +99,7 @@ public class OrderController { @PutMapping("/{id}/refund") public Result refundOrder(@PathVariable String id, @RequestHeader("X-User-Id") String operatorId, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { // 顾客不能退款 if ("customer".equals(role)) { return Result.error("顾客账号不允许退款操作"); @@ -117,7 +115,7 @@ public class OrderController { public Result> getStatistics( @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, - @RequestHeader(value = "X-User-Role", required = defaultString) String role) { + @RequestHeader(value = "X-User-Role", required = false) String role) { // 顾客不能查看统计 if ("customer".equals(role)) { return Result.error("顾客账号不允许查看统计"); diff --git a/src/main/java/com/example/building/entity/Customer.java b/src/main/java/com/example/building/entity/Customer.java index 5384a25..07a1f09 100644 --- a/src/main/java/com/example/building/entity/Customer.java +++ b/src/main/java/com/example/building/entity/Customer.java @@ -66,11 +66,6 @@ public class Customer { */ private LocalDateTime lastLoginAt; - /** - * 最后登录时间(用于订单客户排序) - */ - private LocalDateTime lastLoginAt; - @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;