attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分页查询不同运营商获取骑行中与待支付的订单列表

Browse Source
This commit is contained in:
yanglei 2026-02-26 17:28:54 +08:00
parent c12cbc995f
commit 42941d9e8a
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignDiffOperatorOrderList.java
View File

@ -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;
}

5
ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java
View File

@ -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());

2
ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java
View File

@ -219,7 +219,7 @@ public class EbikeOrderController {
*/
@PostMapping("/api/getDiffOperatorOrderList")
public JsonResult<?> getDiffOperatorOrderList(@RequestBody FeignDiffOperatorOrderList dto) {
List<EbikeDiffOperatorOrderListVo> result = ebikeOrderService.getDiffOperatorOrderList(dto);
Page<EbikeDiffOperatorOrderListVo> result = ebikeOrderService.getDiffOperatorOrderList(dto);
return JsonResult.success(result);
}
}

2
ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java
View File

@ -167,5 +167,5 @@ public interface EbikeOrderService extends IService<EbikeOrder> {
* @param dto 运营商id
* @return 订单列表
*/
List<EbikeDiffOperatorOrderListVo> getDiffOperatorOrderList(FeignDiffOperatorOrderList dto);
Page<EbikeDiffOperatorOrderListVo> getDiffOperatorOrderList(FeignDiffOperatorOrderList dto);
}

7
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
View File

@ -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<EbikeOrderMapper, EbikeOr
}
@Override
public List<EbikeDiffOperatorOrderListVo> getDiffOperatorOrderList(FeignDiffOperatorOrderList dto) {
public Page<EbikeDiffOperatorOrderListVo> getDiffOperatorOrderList(FeignDiffOperatorOrderList dto) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select(
EBIKE_ORDER.ORDER_ID,
@ -570,9 +571,11 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
EBIKE_ORDER.END_TIME,
EBIKE_ORDER.START_LOCATION,
EBIKE_ORDER.END_LOCATION)
.where(EBIKE_ORDER.BIKE_CODE.like(dto.getBikeCode(), StringUtil.hasText(dto.getBikeCode())))
.where(EBIKE_ORDER.OPERATOR_ID.eq(dto.getOperatorId(), Objects.nonNull(dto.getOperatorId())))
.and(EBIKE_ORDER.ORDER_STATUS.in(OrderStatus.IN_PROGRESS, OrderStatus.PENDING_PAYMENT));
return this.mapper.selectListByQueryAs(queryWrapper, EbikeDiffOperatorOrderListVo.class);
Page<EbikeDiffOperatorOrderListVo> pageParam = dto.getPageParam().getPage();
return this.mapper.paginateAs(pageParam, queryWrapper, EbikeDiffOperatorOrderListVo.class);
}
/**