From b4dce9f19595e302d457d6a600e4879c949eba21 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Sun, 24 Aug 2025 12:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E7=94=B5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientOrderController.java | 8 ++++ .../sczx/order/dto/RentBatteySplOrderDTO.java | 43 ++++++++++++++++++ .../sczx/order/mapper/OrderMainMapper.java | 3 ++ .../sczx/order/repository/OrderMainRepo.java | 13 ++++++ .../repository/impl/OrderMainRepoImpl.java | 7 +++ .../com/sczx/order/service/OrderService.java | 9 +++- .../order/service/impl/OrderServiceImpl.java | 13 ++++++ src/main/resources/mapper/OrderMainMapper.xml | 44 +++++++++++++++++++ 8 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/sczx/order/dto/RentBatteySplOrderDTO.java diff --git a/src/main/java/com/sczx/order/controller/ClientOrderController.java b/src/main/java/com/sczx/order/controller/ClientOrderController.java index c11a5e7..37744a2 100644 --- a/src/main/java/com/sczx/order/controller/ClientOrderController.java +++ b/src/main/java/com/sczx/order/controller/ClientOrderController.java @@ -39,6 +39,14 @@ public class ClientOrderController { return Result.ok(orderService.pageCustOrder(pageNo, pageSize, orderQueryReq)); } + @ApiOperation(value = "查询用户租电订单列表") + @PostMapping("/pageCustRentBatteyOrder") + public Result> pageCustRentBatteyOrder(@RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize, + @RequestBody OrderQueryReq orderQueryReq){ + return Result.ok(orderService.pageRentBatteySplOrder(pageNo, pageSize, orderQueryReq)); + } + @ApiOperation(value = "生成租车订单") @PostMapping("/confirmRentalCarOrder") public Result confirmRentalCarOrder(@Valid @RequestBody RentCarOrderReq rentCarOrderReq){ diff --git a/src/main/java/com/sczx/order/dto/RentBatteySplOrderDTO.java b/src/main/java/com/sczx/order/dto/RentBatteySplOrderDTO.java new file mode 100644 index 0000000..1eadd98 --- /dev/null +++ b/src/main/java/com/sczx/order/dto/RentBatteySplOrderDTO.java @@ -0,0 +1,43 @@ +package com.sczx.order.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@ApiModel(value = "租电订单订单列表dto", description = "租电订单订单列表dto") +public class RentBatteySplOrderDTO { + + @ApiModelProperty("租电平台订单号") + private String zdOrderId; + + @ApiModelProperty("租车平台子订单号") + private String suborderNo; + + @ApiModelProperty("订单状态:下单未提车、租赁中、已结束-自动、已结束-手动") + private String orderStatus; + + @ApiModelProperty("图标") + private String icon; + + @ApiModelProperty("电压") + private String voltage; + + @ApiModelProperty("电容") + private String ah; + + @ApiModelProperty("电池类型名称") + private String categoryName; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("首次下单时间") + private LocalDateTime firstOrderTime; + + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("还车时间") + private LocalDateTime endRentTime; +} diff --git a/src/main/java/com/sczx/order/mapper/OrderMainMapper.java b/src/main/java/com/sczx/order/mapper/OrderMainMapper.java index 6b09cfe..10c194e 100644 --- a/src/main/java/com/sczx/order/mapper/OrderMainMapper.java +++ b/src/main/java/com/sczx/order/mapper/OrderMainMapper.java @@ -3,6 +3,7 @@ package com.sczx.order.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sczx.order.dto.OrderSimpleDTO; +import com.sczx.order.dto.RentBatteySplOrderDTO; import com.sczx.order.dto.StoreOrderStatisticsDTO; import com.sczx.order.po.OrderMainPO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -22,4 +23,6 @@ public interface OrderMainMapper extends BaseMapper { StoreOrderStatisticsDTO storeOrderStatistics(@Param("storeId") Long storeId); IPage pageQueryOrder(Page page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatusList") List orderStatusList, String queryBrandName); + + IPage pageQueryRentBatteyOrder(Page page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatusList") List orderStatusList, String queryBrandName); } diff --git a/src/main/java/com/sczx/order/repository/OrderMainRepo.java b/src/main/java/com/sczx/order/repository/OrderMainRepo.java index 7999358..bbcc638 100644 --- a/src/main/java/com/sczx/order/repository/OrderMainRepo.java +++ b/src/main/java/com/sczx/order/repository/OrderMainRepo.java @@ -2,6 +2,7 @@ package com.sczx.order.repository; import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.order.dto.OrderSimpleDTO; +import com.sczx.order.dto.RentBatteySplOrderDTO; import com.sczx.order.dto.StoreOrderStatisticsDTO; import com.sczx.order.po.OrderMainPO; import com.baomidou.mybatisplus.extension.service.IService; @@ -31,4 +32,16 @@ public interface OrderMainRepo extends IService { * @return */ IPage pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List orderStatusList, String queryBrandName); + + /** + * 分页查询租电订单列表 + * + * @param pageNo 页码 + * @param pageSize 每页条数 + * @param customerId 客户ID + * @param storeId 门店ID + * @param orderStatusList 订单状态 + * @return + */ + IPage pageQueryRentBatteyOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List orderStatusList, String queryBrandName); } diff --git a/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java b/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java index fe2cdac..dadb120 100644 --- a/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java +++ b/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java @@ -3,6 +3,7 @@ package com.sczx.order.repository.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sczx.order.dto.OrderSimpleDTO; +import com.sczx.order.dto.RentBatteySplOrderDTO; import com.sczx.order.dto.StoreOrderStatisticsDTO; import com.sczx.order.po.OrderMainPO; import com.sczx.order.mapper.OrderMainMapper; @@ -33,4 +34,10 @@ public class OrderMainRepoImpl extends ServiceImpl Page page = new Page<>(pageNo, pageSize); return this.getBaseMapper().pageQueryOrder(page, customerId, storeId, orderStatusList, queryBrandName); } + + @Override + public IPage pageQueryRentBatteyOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List orderStatusList, String queryBrandName) { + Page page = new Page<>(pageNo, pageSize); + return this.getBaseMapper().pageQueryRentBatteyOrder(page, customerId, storeId, orderStatusList, queryBrandName); + } } diff --git a/src/main/java/com/sczx/order/service/OrderService.java b/src/main/java/com/sczx/order/service/OrderService.java index 3eb0315..fdd68e2 100644 --- a/src/main/java/com/sczx/order/service/OrderService.java +++ b/src/main/java/com/sczx/order/service/OrderService.java @@ -102,7 +102,7 @@ public interface OrderService { StoreOrderStatisticsDTO storeOrderStatistics(Long storeId); /** - * 查询门店订单列表 + * 查询用户租车订单列表 * @param orderQueryReq * @return */ @@ -114,4 +114,11 @@ public interface OrderService { * @return */ IPage pageStoreOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq); + + /** + * 查询用户租电订单列表 + * @param orderQueryReq + * @return + */ + IPage pageRentBatteySplOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq); } diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index dd33e5b..b085ddf 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -861,6 +861,19 @@ public class OrderServiceImpl implements OrderService { return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList, orderQueryReq.getQueryBrandName()); } + @Override + public IPage pageRentBatteySplOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) { + if(Objects.isNull(orderQueryReq.getCustomerId())){ + orderQueryReq.setCustomerId(Long.valueOf(jwtUtil.getUserInfoFromToken().getUserId().toString())); + } + List orderStatusList = null; + if(!CollectionUtils.isEmpty(orderQueryReq.getOrderStatusList())){ + orderStatusList = orderQueryReq.getOrderStatusList().stream().map(OrderStatusEnum::getCode).collect(Collectors.toList()); + } + + return orderMainRepo.pageQueryRentBatteyOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList, orderQueryReq.getQueryBrandName()); + } + /** * 支付成功更新订单状态 * @param orderMainPO diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml index fbb1add..f835caf 100644 --- a/src/main/resources/mapper/OrderMainMapper.xml +++ b/src/main/resources/mapper/OrderMainMapper.xml @@ -59,4 +59,48 @@ + +