From 42941d9e8a5f29400abc1e30d69847af136348e06867760e04c339c3871681f0 Mon Sep 17 00:00:00 2001 From: yanglei Date: Thu, 26 Feb 2026 17:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E8=BF=90=E8=90=A5=E5=95=86=E8=8E=B7=E5=8F=96=E9=AA=91?= =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E4=B8=8E=E5=BE=85=E6=94=AF=E4=BB=98=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/model/dto/FeignDiffOperatorOrderList.java | 13 +++++++++++++ .../controller/EbikeStatisticsController.java | 5 ++++- .../cdzy/user/controller/EbikeOrderController.java | 2 +- .../com/cdzy/user/service/EbikeOrderService.java | 2 +- .../user/service/impl/EbikeOrderServiceImpl.java | 7 +++++-- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignDiffOperatorOrderList.java b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignDiffOperatorOrderList.java index d61e3c5..0fa3c71 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignDiffOperatorOrderList.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignDiffOperatorOrderList.java @@ -1,5 +1,6 @@ package com.ebike.feign.model.dto; +import com.cdzy.common.model.request.PageParam; import lombok.Data; /** @@ -9,6 +10,18 @@ import lombok.Data; @Data public class FeignDiffOperatorOrderList { + /** + * 运营商id + */ private Long operatorId; + /** + * 车辆编号 + */ + private String bikeCode; + + /** + * 分页查询参数 + */ + private PageParam pageParam; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java index a0db5e9..a6f3781 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil; import com.cdzy.common.enums.Code; import com.cdzy.common.ex.EbikeException; import com.cdzy.common.model.dto.ResGPSDto; +import com.cdzy.common.model.request.PageParam; import com.cdzy.common.model.response.CommonStaffInfo; import com.cdzy.common.model.response.JsonResult; import com.cdzy.operations.model.dto.EbikeCloseOrderDto; @@ -122,7 +123,7 @@ public class EbikeStatisticsController { * @return 订单列表 */ @GetMapping("getDiffOperatorOrderList") - public JsonResult getDiffOperatorOrderList() { + public JsonResult getDiffOperatorOrderList(String bikeCode, PageParam pageParam) { FeignDiffOperatorOrderList dto = new FeignDiffOperatorOrderList(); long staffId = StpUtil.getLoginIdAsLong(); CommonStaffInfo staffInfo = StpUtil.getSession().getModel(String.valueOf(staffId), CommonStaffInfo.class); @@ -137,6 +138,8 @@ public class EbikeStatisticsController { if (!isSuperAdmin) { dto.setOperatorId(staffInfo.getOperatorId()); } + dto.setBikeCode(bikeCode); + dto.setPageParam(pageParam); JsonResult jsonResult = userFeignClient.getDiffOperatorOrderList(dto); if (jsonResult.getCode() != Code.SUCCESS) { throw new EbikeException(jsonResult.getMessage()); diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java index 2bfc77c..5bbf870 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java @@ -219,7 +219,7 @@ public class EbikeOrderController { */ @PostMapping("/api/getDiffOperatorOrderList") public JsonResult getDiffOperatorOrderList(@RequestBody FeignDiffOperatorOrderList dto) { - List result = ebikeOrderService.getDiffOperatorOrderList(dto); + Page result = ebikeOrderService.getDiffOperatorOrderList(dto); return JsonResult.success(result); } } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java index 737f7de..a5daed0 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java @@ -167,5 +167,5 @@ public interface EbikeOrderService extends IService { * @param dto 运营商id * @return 订单列表 */ - List getDiffOperatorOrderList(FeignDiffOperatorOrderList dto); + Page getDiffOperatorOrderList(FeignDiffOperatorOrderList dto); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java index 0f29f4a..e0d5083 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java @@ -47,6 +47,7 @@ import com.ebike.feign.model.vo.FeignEbikeOrderStatisticsVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; +import com.mybatisflex.core.util.StringUtil; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -556,7 +557,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl getDiffOperatorOrderList(FeignDiffOperatorOrderList dto) { + public Page getDiffOperatorOrderList(FeignDiffOperatorOrderList dto) { QueryWrapper queryWrapper = QueryWrapper.create() .select( EBIKE_ORDER.ORDER_ID, @@ -570,9 +571,11 @@ public class EbikeOrderServiceImpl extends ServiceImpl pageParam = dto.getPageParam().getPage(); + return this.mapper.paginateAs(pageParam, queryWrapper, EbikeDiffOperatorOrderListVo.class); } /**