diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java index 604c6058..7beb52ed 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java +++ b/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 request) { + public JsonResult getWorkOrderList(@RequestBody ReqWorkOrderListDto request) { // 调用服务层方法，获取工单列表数据 return ebikeBikeInfoService.getWorkOrderList(request); } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/PageParam.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/PageParam.java new file mode 100644 index 00000000..28b9749b --- /dev/null +++ b/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; +} diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderListDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderListDto.java new file mode 100644 index 00000000..2783becb --- /dev/null +++ b/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; +} diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java index 04220c28..745f3d1f 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java @@ -296,7 +296,7 @@ public interface EbikeBikeInfoService extends IService { * @param param 获取工单列表请求参数，如分页信息、筛选条件等 * @return 返回工单列表数据 */ - JsonResult getWorkOrderList(Map param); + JsonResult getWorkOrderList(ReqWorkOrderListDto param); /** *根据regin_id 获取车辆详情和EcuId diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index 9b7991e2..102db603 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -1395,18 +1395,18 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl getWorkOrderList(Map param) { + public JsonResult getWorkOrderList(ReqWorkOrderListDto param) { try { // 获取当前操作用户的staff信息 StaffFeign staffFeign = getStaffFeignInfo(); // 获取当前用户ID String userId = staffFeign.getStaffId().toString(); // 获取分页参数 - Map param1 = (Map)param.get("pageParam"); - int pageNum = (int) param1.get("pageNum"); - int pageSize = (int) param1.get("pageSize"); - String orderType = param.get("orderType")==null?"":param.get("orderType").toString(); - String bikeCode = param.get("bikeCode")==null?"":param.get("bikeCode").toString(); + com.cdzy.ebikemaintenance.model.dto.request.PageParam pageParam = param.getPageParam(); + int pageNum = pageParam.getPageNum(); + int pageSize = pageParam.getPageSize(); + String orderType = param.getOrderType(); + String bikeCode = param.getBikeCode(); // 创建查询条件 QueryWrapper query = QueryWrapper.create() .select("order_id, bike_code, order_type, created_at, receiver_id, dispatch_type," + diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java index ddcce38b..915775f4 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java +++ b/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 params) { + List faultListByWeChatUser = ebikeUserFaultreportService.getFaultListByWeChatUser(params); + return JsonResult.success(faultListByWeChatUser); + } } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java index 24444014..26e93dcc 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java +++ b/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 params) { + public JsonResult orderDetailsUserList(@RequestBody ReqOrderDetailsDto params) { List info = userOrdersService.orderDetailsUserList(params); return JsonResult.success(info); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java index 00eebfaa..611747ee 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java @@ -38,12 +38,6 @@ public interface UserOrdersMapper extends BaseMapper { "created_at, total_amount, bike_code " + "FROM ebike_user_orders AS A " + "WHERE A.user_id = #{userId} " + - " " + - "AND A.status IN (0, 1, 2, 3) " + - "" + - " " + - "AND A.status IN (4, 5) " + - "" + "LIMIT #{pageSize} OFFSET #{offset}" + "") @Results({ @@ -59,7 +53,6 @@ public interface UserOrdersMapper extends BaseMapper { @Result(property = "bikeCode", column = "bike_code") }) List getOrderDetailsUserList(@Param("userId") String userId, - @Param("orderType") String orderType, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/PageParam.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/PageParam.java new file mode 100644 index 00000000..6715e9a4 --- /dev/null +++ b/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; +} diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/ReqOrderDetailsDto.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/req/ReqOrderDetailsDto.java new file mode 100644 index 00000000..2c780d9f --- /dev/null +++ b/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; +} diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/EbikeUserFaultreportService.java b/ebike-orders/src/main/java/com/cdzy/orders/service/EbikeUserFaultreportService.java index 5537a8d0..1f78c032 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/EbikeUserFaultreportService.java +++ b/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 list(EbikeUserFaultreportQueryDto queryParam); + + /** + * 根据用户上报故障信息userId获取列表信息。 + * + * @param params + * @return 用户上报故障信息userId获取列表信息 + */ + List getFaultListByWeChatUser( Map params); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java b/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java index 3ab0a228..2966ba63 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java +++ b/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 { * @param params 用户Id * @ 用户订单表详情 */ - List orderDetailsUserList(Map params); + List orderDetailsUserList(ReqOrderDetailsDto params); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java index 60a865e8..96de128d 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java +++ b/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 getFaultListByWeChatUser(Map params) { + String userId= MapUtil.getStr(params,"userId"); + Map pageParam = ( Map)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 paginate = ebikeUserFaultreportMapper.paginate(pageNum, pageSize, query); + return paginate.getRecords(); + } } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java index 00faad69..e3b04c0c 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java +++ b/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 orderDetailsUserList(Map params) { - String userId = MapUtil.getStr(params,"userId"); - Map pageParam = ( Map)params.get("pageParam"); - Integer pageNum= MapUtil.getInt(pageParam,"pageNum"); - Integer pageSize= MapUtil.getInt(pageParam,"pageSize"); - String orderType = ""; //consumption 消费 refund 退款 - orderType= MapUtil.getStr(pageParam,"orderType"); + public List orderDetailsUserList(ReqOrderDetailsDto params) { + String userId = params.getUserId().toString(); + PageParam pageParam = params.getPageParam(); + Integer pageNum= pageParam.getPageNum(); + Integer pageSize= pageParam.getPageSize(); Integer offset = (pageNum - 1) * pageSize; // 计算OFFSET - List orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId,orderType,offset,pageSize); + List orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId,offset,pageSize); return orderDetailsUserList; } }