From 930e49bcd3bf24955e49f63037973931b4b56824a0edd091e9d7467694462aff Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Tue, 18 Nov 2025 13:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=85=E9=9A=9C=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/user/controller/EbikeFaultReportController.java | 9 ++++-----
 .../com/cdzy/user/model/dto/EbikeFaultReportDto.java     | 7 +++++++
 .../java/com/cdzy/user/model/vo/EbikeFaultReportVo.java  | 3 +--
 .../user/service/impl/EbikeFaultReportServiceImpl.java   | 3 ++-
 ebike-user/src/main/resources/db/init.sql                | 2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java
index 9810754..5a33547 100644
--- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java
+++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java
@@ -1,6 +1,5 @@
 package com.cdzy.user.controller;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.cdzy.common.model.request.PageParam;
 import com.cdzy.common.model.response.JsonResult;
 import com.cdzy.user.model.dto.EbikeFaultReportDto;
@@ -114,14 +113,14 @@ public class EbikeFaultReportController {
     }
 
     /**
-     * 根据用户id查询用户故障上报信息
+     * 根据用户id分页查询用户故障上报信息
      *
      * @param pageParam 分页参数
      */
-    @PostMapping("queryFaultReportByUserId")
-    public JsonResult<?> getFaultListByWeChatUser(PageParam pageParam) {
+    @GetMapping("queryFaultReportByUserId")
+    public JsonResult<?> getFaultListByWeChatUser(@RequestParam("userId") Long userId, PageParam pageParam) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(EBIKE_FAULT_REPORT.CREATE_BY.eq(StpUtil.getLoginIdAsLong()));
+                .where(EBIKE_FAULT_REPORT.CREATE_BY.eq(userId));
         Page<EbikeFaultReport> page = ebikeFaultReportService.page(pageParam.getPage(), queryWrapper);
         return JsonResult.success(page);
     }
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
index d6b48ad..3fcccc6 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mybatisflex.annotation.Column;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,6 +33,12 @@ public class EbikeFaultReportDto {
      */
     private Long reportId;
 
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
     /**
      * 车辆编号
      */
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java
index d6c3691..212b6b2 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java
@@ -36,11 +36,10 @@ public class EbikeFaultReportVo {
     /**
      * 车辆编号
      */
-    @NotBlank(message = "车辆编号不能为空!")
     private String bikeCode;
 
     /**
-     * operatorId
+     * 运营商id
      */
     private Long operatorId;
 
diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
index dff0201..92ee5dc 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
@@ -71,6 +71,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .location(ebikeFaultReportDto.getLocation())
                 .orderId(ebikeFaultReportDto.getOrderId())
                 .reviewId(ebikeFaultReportDto.getReviewId())
+                .createBy(ebikeFaultReportDto.getUserId())
                 .build();
         this.save(userFaultReport);
         // 保存附件信息
@@ -162,7 +163,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .location(ebikeFaultReportDto.getLocation())
                 .orderId(ebikeFaultReportDto.getOrderId())
                 .reviewId(ebikeFaultReportDto.getReviewId())
-                //.updateBy(userId)
+                .updateBy(ebikeFaultReportDto.getUserId())
                 .build();
         this.updateById(userFaultReport);
         List<EbikeAttachmentFileDto> attachmentFiles = ebikeFaultReportDto.getAttachmentFiles();
diff --git a/ebike-user/src/main/resources/db/init.sql b/ebike-user/src/main/resources/db/init.sql
index 48ce3b2..bc671d9 100644
--- a/ebike-user/src/main/resources/db/init.sql
+++ b/ebike-user/src/main/resources/db/init.sql
@@ -395,7 +395,7 @@ CREATE TABLE "public"."ebike_refund_file" (
           "is_deleted" bool NOT NULL DEFAULT false
 );
 COMMENT ON COLUMN "public"."ebike_attachment_file"."file_id" IS '主键ID';
-COMMENT ON COLUMN "public"."ebike_attachment_file"."report_id" IS '退款主键id';
+COMMENT ON COLUMN "public"."ebike_attachment_file"."refund_id" IS '退款主键id';
 COMMENT ON COLUMN "public"."ebike_attachment_file"."file_name" IS '附件文件名';
 COMMENT ON COLUMN "public"."ebike_attachment_file"."file_type" IS '附件类型';
 COMMENT ON COLUMN "public"."ebike_attachment_file"."file_url" IS '附件地址';