sales/todo-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复Customer重复字段和OrderController错误导入
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Agent
2026-03-24 12:53:22 +00:00
parent 72ffc10f6c
commit be26d87552
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/example/building/controller/OrderController.java
View File

@@ -9,8 +9,6 @@ import com.example.building.service.SystemConfigService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import static java.lang.String.defaultString;
import java.util.Map; import java.util.Map;
/** /**
@@ -39,7 +37,7 @@ public class OrderController {
public Result<Order> createOrder(@RequestBody CreateOrderRequest request, public Result<Order> createOrder(@RequestBody CreateOrderRequest request,
@RequestHeader("X-User-Id") String operatorId, @RequestHeader("X-User-Id") String operatorId,
@RequestHeader("X-Username") String operatorName, @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)) { if ("customer".equals(role)) {
return Result.error("顾客账号不允许创建订单，请联系销售人员"); return Result.error("顾客账号不允许创建订单，请联系销售人员");
@@ -59,7 +57,7 @@ public class OrderController {
@RequestParam(required = false) String endDate, @RequestParam(required = false) String endDate,
@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "20") Integer pageSize, @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) { if ("customer".equals(role) && startDate == null) {
@@ -76,7 +74,7 @@ public class OrderController {
@GetMapping("/{id}") @GetMapping("/{id}")
public Result<Map<String, Object>> getOrderDetail(@PathVariable String id, public Result<Map<String, Object>> getOrderDetail(@PathVariable String id,
@RequestHeader("X-User-Id") String userId, @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)); return Result.success(orderService.getOrderDetail(id, userId, role));
} }
@@ -86,7 +84,7 @@ public class OrderController {
@PutMapping("/{id}/cancel") @PutMapping("/{id}/cancel")
public Result<Void> cancelOrder(@PathVariable String id, public Result<Void> cancelOrder(@PathVariable String id,
@RequestHeader("X-User-Id") String operatorId, @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)) { if ("customer".equals(role)) {
return Result.error("顾客账号不允许取消订单"); return Result.error("顾客账号不允许取消订单");
@@ -101,7 +99,7 @@ public class OrderController {
@PutMapping("/{id}/refund") @PutMapping("/{id}/refund")
public Result<Void> refundOrder(@PathVariable String id, public Result<Void> refundOrder(@PathVariable String id,
@RequestHeader("X-User-Id") String operatorId, @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)) { if ("customer".equals(role)) {
return Result.error("顾客账号不允许退款操作"); return Result.error("顾客账号不允许退款操作");
@@ -117,7 +115,7 @@ public class OrderController {
public Result<Map<String, Object>> getStatistics( public Result<Map<String, Object>> getStatistics(
@RequestParam(required = false) String startDate, @RequestParam(required = false) String startDate,
@RequestParam(required = false) String endDate, @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)) { if ("customer".equals(role)) {
return Result.error("顾客账号不允许查看统计"); return Result.error("顾客账号不允许查看统计");

5
src/main/java/com/example/building/entity/Customer.java
View File

@@ -66,11 +66,6 @@ public class Customer {
*/ */
private LocalDateTime lastLoginAt; private LocalDateTime lastLoginAt;
/**
* 最后登录时间（用于订单客户排序）
*/
private LocalDateTime lastLoginAt;
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private LocalDateTime createdAt; private LocalDateTime createdAt;