diff --git a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/controller/operation/OperationOrdersController.java b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/controller/operation/OperationOrdersController.java index 87d762f..84f84e3 100644 --- a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/controller/operation/OperationOrdersController.java +++ b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/controller/operation/OperationOrdersController.java @@ -1,20 +1,13 @@ package com.jzo2o.orders.manager.controller.operation; -import cn.hutool.core.bean.BeanUtil; -import com.jzo2o.api.orders.dto.request.OrderCancelReqDTO; import com.jzo2o.api.orders.dto.response.OrderSimpleResDTO; -import com.jzo2o.common.model.CurrentUserInfo; import com.jzo2o.common.model.PageResult; -import com.jzo2o.mvc.utils.UserContext; import com.jzo2o.orders.manager.model.dto.request.OrderPageQueryReqDTO; -import com.jzo2o.orders.manager.model.dto.OrderCancelDTO; -import com.jzo2o.orders.manager.model.dto.response.OperationOrdersDetailResDTO; import com.jzo2o.orders.manager.service.IOrdersManagerService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -25,6 +18,12 @@ import javax.annotation.Resource; @Api(tags = "运营端-订单相关接口") @RequestMapping("/operation/orders") public class OperationOrdersController { + @Resource + private IOrdersManagerService ordersManagerService; + @GetMapping("/page") + public PageResult operationQueryList(OrderPageQueryReqDTO orderPageQueryReqDTO) { + return ordersManagerService.operationQueryList(orderPageQueryReqDTO); + } -} +} \ No newline at end of file diff --git a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/IOrdersManagerService.java b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/IOrdersManagerService.java index c786e06..177b131 100644 --- a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/IOrdersManagerService.java +++ b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/IOrdersManagerService.java @@ -3,7 +3,9 @@ package com.jzo2o.orders.manager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jzo2o.api.orders.dto.response.OrderResDTO; import com.jzo2o.api.orders.dto.response.OrderSimpleResDTO; +import com.jzo2o.common.model.PageResult; import com.jzo2o.orders.base.model.domain.Orders; +import com.jzo2o.orders.manager.model.dto.request.OrderPageQueryReqDTO; import java.util.List; @@ -47,4 +49,9 @@ public interface IOrdersManagerService extends IService { * @param count 订单数量 */ List getPayOverTimeOrder(Integer count); + + /** + * 管理端分页查询 + */ + PageResult operationQueryList(OrderPageQueryReqDTO orderPageQueryReqDTO); } \ No newline at end of file diff --git a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/impl/OrdersManagerServiceImpl.java b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/impl/OrdersManagerServiceImpl.java index 8925386..2d16be3 100644 --- a/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/impl/OrdersManagerServiceImpl.java +++ b/jzo2o-oreders/jzo2o-orders-manager/src/main/java/com/jzo2o/orders/manager/service/impl/OrdersManagerServiceImpl.java @@ -2,19 +2,23 @@ package com.jzo2o.orders.manager.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jzo2o.api.orders.dto.response.OrderResDTO; import com.jzo2o.api.orders.dto.response.OrderSimpleResDTO; +import com.jzo2o.common.model.PageResult; import com.jzo2o.common.utils.BeanUtils; import com.jzo2o.common.utils.CollUtils; import com.jzo2o.common.utils.JsonUtils; import com.jzo2o.common.utils.ObjectUtils; +import com.jzo2o.mysql.utils.PageUtils; import com.jzo2o.orders.base.constants.RedisConstants; import com.jzo2o.orders.base.enums.OrderStatusEnum; import com.jzo2o.orders.base.handler.OrderStateMachine; import com.jzo2o.orders.base.mapper.OrdersMapper; import com.jzo2o.orders.base.model.domain.Orders; import com.jzo2o.orders.base.model.dto.OrderSnapshotDTO; +import com.jzo2o.orders.manager.model.dto.request.OrderPageQueryReqDTO; import com.jzo2o.orders.manager.service.IOrdersCanceledService; import com.jzo2o.orders.manager.service.IOrdersManagerService; import com.jzo2o.redis.helper.CacheHelper; @@ -146,4 +150,20 @@ public class OrdersManagerServiceImpl extends ServiceImpl .last("LIMIT " + count) .list(); } + + @Override + public PageResult operationQueryList(OrderPageQueryReqDTO orderPageQueryReqDTO) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery() + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getId()), Orders::getId, orderPageQueryReqDTO.getId()) + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getOrdersStatus()), Orders::getOrdersStatus, orderPageQueryReqDTO.getOrdersStatus()) + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getPayStatus()), Orders::getPayStatus, orderPageQueryReqDTO.getPayStatus()) + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getRefundStatus()), Orders::getRefundStatus, orderPageQueryReqDTO.getRefundStatus()) + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getUserId()), Orders::getUserId, orderPageQueryReqDTO.getUserId()) + .eq(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getContactsPhone()), Orders::getContactsPhone, orderPageQueryReqDTO.getContactsPhone()) + .ge(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getMinCreateTime()), Orders::getCreateTime, orderPageQueryReqDTO.getMinCreateTime()) + .le(ObjectUtils.isNotEmpty(orderPageQueryReqDTO.getMaxCreateTime()), Orders::getCreateTime, orderPageQueryReqDTO.getMaxCreateTime()); + Page ordersPage = PageUtils.parsePageQuery(orderPageQueryReqDTO, Orders.class); + + return PageUtils.toPage(baseMapper.selectPage(ordersPage, queryWrapper), OrderSimpleResDTO.class); + } } \ No newline at end of file