修改接受参数Dto 和故障报修接口

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java

@@ -839,7 +839,7 @@ public class EbikeBikeInfoController {
      * @return 返回工单列表数据
      */
     @PostMapping("getWorkOrderList")
-    public JsonResult<?> getWorkOrderList(@RequestBody Map<String, Object> request) {
+    public JsonResult<?> getWorkOrderList(@RequestBody ReqWorkOrderListDto request) {
         // 调用服务层方法，获取工单列表数据
         return ebikeBikeInfoService.getWorkOrderList(request);
     }

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/PageParam.java

@@ -0,0 +1,23 @@
+package com.cdzy.ebikemaintenance.model.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 分页参数。
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageParam {
+    /**
+     * 当前页码
+     */
+    private int pageNum;
+
+    /**
+     * 每页显示的条数
+     */
+    private int pageSize;
+}

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderListDto.java

@@ -0,0 +1,32 @@
+package com.cdzy.ebikemaintenance.model.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 获取工单列表请求参数。
+ *
+ * @author dingchao
+ * @date 2025/5/15
+ * @modified by:
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqWorkOrderListDto {
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 自行车编码
+     */
+    private String bikeCode;
+
+    /**
+     * 分页参数
+     */
+    private PageParam pageParam;
+}

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java

@@ -296,7 +296,7 @@ public interface EbikeBikeInfoService extends IService<EbikeBikeInfo> {
      * @param param 获取工单列表请求参数，如分页信息、筛选条件等
      * @return 返回工单列表数据
      */
-    JsonResult<?> getWorkOrderList(Map<String,Object> param);
+    JsonResult<?> getWorkOrderList(ReqWorkOrderListDto param);
 
     /**
      *根据regin_id 获取车辆详情和EcuId

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java

@@ -1395,18 +1395,18 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
     }
 
 
-    public JsonResult<?> getWorkOrderList(Map<String, Object> param) {
+    public JsonResult<?> getWorkOrderList(ReqWorkOrderListDto param) {
         try {
             // 获取当前操作用户的staff信息
             StaffFeign staffFeign = getStaffFeignInfo();
             // 获取当前用户ID
             String userId = staffFeign.getStaffId().toString();
             // 获取分页参数
-            Map<String,Object> param1 = (Map<String,Object>)param.get("pageParam");
+            com.cdzy.ebikemaintenance.model.dto.request.PageParam pageParam = param.getPageParam();
-            int pageNum = (int) param1.get("pageNum");
+            int pageNum = pageParam.getPageNum();
-            int pageSize = (int) param1.get("pageSize");
+            int pageSize =  pageParam.getPageSize();
-            String orderType = param.get("orderType")==null?"":param.get("orderType").toString();
+            String orderType = param.getOrderType();
-            String bikeCode = param.get("bikeCode")==null?"":param.get("bikeCode").toString();
+            String bikeCode = param.getBikeCode();
             // 创建查询条件
             QueryWrapper query = QueryWrapper.create()
                     .select("order_id, bike_code, order_type, created_at, receiver_id, dispatch_type," +

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java

@@ -13,6 +13,7 @@ import com.cdzy.orders.model.entity.EbikeUserFaultreport;
 import com.cdzy.orders.service.EbikeUserFaultreportService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户上报故障信息 控制层。
@@ -125,5 +126,16 @@ public class EbikeUserFaultreportController {
         }
         return JsonResult.success(list);
     }
+    /**
+     * 根据用户上报故障信息userId获取列表信息。
+     *
+     * @param params
+     * @return 用户上报故障信息userId获取列表信息
+     */
+    @PostMapping("getFaultListByWeChatUser")
+    public JsonResult<?> getFaultListByWeChatUser(@RequestBody Map<String,Object> params) {
+        List<EbikeUserFaultreport> faultListByWeChatUser = ebikeUserFaultreportService.getFaultListByWeChatUser(params);
+        return JsonResult.success(faultListByWeChatUser);
+    }
 
 }

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java

@@ -3,6 +3,7 @@ package com.cdzy.orders.controller;
 import com.cdzy.common.model.JsonResult;
 import com.cdzy.common.model.PageParam;
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
+import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList;
@@ -245,7 +246,7 @@ public class EbikeUserOrdersController {
      * @ 用户订单表详情
      */
     @PostMapping("orderDetailsUserList")
-    public JsonResult<?> orderDetailsUserList(@RequestBody Map<String,Object> params) {
+    public JsonResult<?> orderDetailsUserList(@RequestBody ReqOrderDetailsDto params) {
         List<RspOrderDetailsUserList> info = userOrdersService.orderDetailsUserList(params);
         return JsonResult.success(info);
     }

ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java

@@ -38,12 +38,6 @@ public interface UserOrdersMapper extends BaseMapper<EbikeUserOrders> {
             "created_at, total_amount, bike_code " +
             "FROM ebike_user_orders AS A " +
             "WHERE A.user_id = #{userId} " +
-            "<if test='orderType == \"consumption\"'> " +
-            "AND A.status IN (0, 1, 2, 3) " +
-            "</if>" +
-            "<if test='orderType == \"refund\"'> " +
-            "AND A.status IN (4, 5) " +
-            "</if>" +
             "LIMIT #{pageSize} OFFSET #{offset}" +
             "</script>")
     @Results({
@@ -59,7 +53,6 @@ public interface UserOrdersMapper extends BaseMapper<EbikeUserOrders> {
             @Result(property = "bikeCode", column = "bike_code")
     })
     List<RspOrderDetailsUserList> getOrderDetailsUserList(@Param("userId") String userId,
-                                                          @Param("orderType") String orderType,
                                                           @Param("offset") Integer offset,
                                                           @Param("pageSize") Integer pageSize);
 }

ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/PageParam.java

@@ -0,0 +1,23 @@
+package com.cdzy.orders.model.dto.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 分页参数。
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageParam {
+    /**
+     * 当前页码
+     */
+    private int pageNum;
+
+    /**
+     * 每页显示的条数
+     */
+    private int pageSize;
+}

ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/ReqOrderDetailsDto.java

@@ -0,0 +1,27 @@
+package com.cdzy.orders.model.dto.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户订单详情请求参数。
+ *
+ * @author dingchao
+ * @date 2025/5/15
+ * @modified by:
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqOrderDetailsDto {
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 分页参数
+     */
+    private PageParam pageParam;
+}

ebike-orders/src/main/java/com/cdzy/orders/service/EbikeUserFaultreportService.java

@@ -6,6 +6,7 @@ import com.mybatisflex.core.service.IService;
 import com.cdzy.orders.model.entity.EbikeUserFaultreport;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户上报故障信息 服务层。
@@ -37,4 +38,12 @@ public interface EbikeUserFaultreportService extends IService<EbikeUserFaultrepo
      * @return 列表
      */
     List<EbikeUserFaultreportDto> list(EbikeUserFaultreportQueryDto queryParam);
+
+    /**
+     * 根据用户上报故障信息userId获取列表信息。
+     *
+     * @param params
+     * @return 用户上报故障信息userId获取列表信息
+     */
+    List<EbikeUserFaultreport> getFaultListByWeChatUser( Map<String,Object> params);
 }

ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java

@@ -1,6 +1,7 @@
 package com.cdzy.orders.service;
 
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
+import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList;
@@ -125,5 +126,5 @@ public interface UserOrdersService extends IService<EbikeUserOrders> {
      * @param params 用户Id
      * @ 用户订单表详情
      */
-    List<RspOrderDetailsUserList> orderDetailsUserList(Map<String,Object> params);
+    List<RspOrderDetailsUserList> orderDetailsUserList(ReqOrderDetailsDto params);
 }

ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cdzy.orders.service.impl;
 
+import cn.hutool.core.map.MapUtil;
 import com.cdzy.common.model.EbikeOrderAttachmentFileDto;
 import com.cdzy.common.model.EbikeUserFaultreportQueryDto;
 import com.cdzy.common.model.EbikeUserFaultreportDto;
@@ -8,6 +9,7 @@ import com.cdzy.orders.model.entity.EbikeOrderAttachmentFile;
 import com.cdzy.orders.service.EbikeAttachefileAssociatedService;
 import com.cdzy.orders.service.EbikeOrderAttachmentFileService;
 import com.cdzy.orders.uitls.MinioUtil;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.cdzy.orders.model.entity.EbikeUserFaultreport;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 import static com.cdzy.orders.model.entity.table.EbikeAttachefileAssociatedTableDef.EBIKE_ATTACHEFILE_ASSOCIATED;
 import static com.cdzy.orders.model.entity.table.EbikeUserFaultreportTableDef.EBIKE_USER_FAULTREPORT;
@@ -42,6 +45,8 @@ public class EbikeUserFaultreportServiceImpl extends ServiceImpl<EbikeUserFaultr
     @Autowired
     private MinioUtil minioUtil;
 
+    @Autowired
+    private EbikeUserFaultreportMapper ebikeUserFaultreportMapper;
     @Transactional
     @Override
     public boolean save(EbikeUserFaultreportDto ebikeUserFaultreport) {
@@ -127,4 +132,20 @@ public class EbikeUserFaultreportServiceImpl extends ServiceImpl<EbikeUserFaultr
         return dtoList;
     }
 
+    /**
+     * 根据用户上报故障信息userId获取列表信息。
+     *
+     * @param params
+     * @return 用户上报故障信息userId获取列表信息
+     */
+    public List<EbikeUserFaultreport> getFaultListByWeChatUser(Map<String,Object> params) {
+        String userId= MapUtil.getStr(params,"userId");
+        Map<String,Object> pageParam = ( Map<String,Object>)params.get("pageParam");
+        Integer pageNum= MapUtil.getInt(pageParam,"pageNum");
+        Integer pageSize= MapUtil.getInt(pageParam,"pageSize");
+        QueryWrapper query = QueryWrapper.create();
+        query.eq("report_user",userId);
+        Page<EbikeUserFaultreport> paginate = ebikeUserFaultreportMapper.paginate(pageNum, pageSize, query);
+        return paginate.getRecords();
+    }
 }

ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java

@@ -10,7 +10,9 @@ import com.cdzy.orders.component.EbikeCoreHandler;
 import com.cdzy.orders.enums.*;
 import com.cdzy.orders.mapper.EbikeOrderDetailsMapper;
 import com.cdzy.orders.mapper.UserOrdersMapper;
+import com.cdzy.orders.model.dto.req.PageParam;
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
+import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.cdzy.orders.model.dto.res.RedisPoint;
 import com.cdzy.orders.model.dto.res.RspBikeDto;
@@ -667,15 +669,13 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
      * @ 用户订单表详情
      */
     @Override
-    public  List<RspOrderDetailsUserList> orderDetailsUserList(Map<String,Object> params) {
+    public  List<RspOrderDetailsUserList> orderDetailsUserList(ReqOrderDetailsDto params) {
-        String userId = MapUtil.getStr(params,"userId");
+        String userId = params.getUserId().toString();
-        Map<String,Object> pageParam = ( Map<String,Object>)params.get("pageParam");
+        PageParam pageParam = params.getPageParam();
-        Integer pageNum= MapUtil.getInt(pageParam,"pageNum");
+        Integer pageNum= pageParam.getPageNum();
-        Integer pageSize= MapUtil.getInt(pageParam,"pageSize");
+        Integer pageSize= pageParam.getPageSize();
-        String orderType = ""; //consumption 消费  refund 退款
-        orderType= MapUtil.getStr(pageParam,"orderType");
         Integer offset = (pageNum - 1) * pageSize;  // 计算OFFSET
-        List<RspOrderDetailsUserList> orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId,orderType,offset,pageSize);
+        List<RspOrderDetailsUserList> orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId,offset,pageSize);
         return orderDetailsUserList;
     }
 }