From 444dbdae646f623398ac2df99b4b03dbf68e8cf3 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Thu, 11 Apr 2024 17:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/order/AppOrderController.java | 3 ++- .../member/controller/app/order/vo/AppPageVo.java | 15 +++++++++++++++ .../module/member/service/order/OrderService.java | 4 ++-- .../member/service/order/OrderServiceImpl.java | 7 +++---- 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppPageVo.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/AppOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/AppOrderController.java index 45830ff0..b9d47306 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/AppOrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/AppOrderController.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderPageReqVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderRespVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderSaveReqVO; +import cn.iocoder.yudao.module.member.controller.app.order.vo.AppPageVo; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.service.order.OrderService; import io.swagger.v3.oas.annotations.Operation; @@ -93,7 +94,7 @@ public class AppOrderController { @GetMapping("/list") @Operation(summary = "获得会员订单") - public CommonResult> getOrderPage(PageParam vo) { + public CommonResult> getOrderPage(AppPageVo vo) { PageResult orderList = orderService.getOrderList(vo); return success(orderList); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppPageVo.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppPageVo.java new file mode 100644 index 00000000..08b8a6f4 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppPageVo.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.member.controller.app.order.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import lombok.Data; + +/** + * @author zt + * @description + * @since 2024/4/11 + */ +@Data +public class AppPageVo extends PageParam { + + private Long userId; +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java index bcaf5c64..75ef77ee 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.member.service.order; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderDetailsReqVO; import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderDetailsRespVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderPageReqVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderRespVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderSaveReqVO; +import cn.iocoder.yudao.module.member.controller.app.order.vo.AppPageVo; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import javax.validation.Valid; @@ -62,7 +62,7 @@ public interface OrderService { * 获得会员订单分页 * @return */ - PageResult getOrderList(PageParam vo); + PageResult getOrderList(AppPageVo vo); /** diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java index 7e2a688f..d7b440d9 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.member.service.order; import cn.hutool.core.util.ObjUtil; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -11,6 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderDetailsResp import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderPageReqVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderRespVO; import cn.iocoder.yudao.module.member.controller.app.order.vo.AppOrderSaveReqVO; +import cn.iocoder.yudao.module.member.controller.app.order.vo.AppPageVo; import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailRespVO; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; @@ -126,9 +126,8 @@ public class OrderServiceImpl implements OrderService { } @Override - public PageResult getOrderList(PageParam vo) { - Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); - PageResult dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.lambdaQuery().eq(DishOrderDO::getUserId, loginUserId)); + public PageResult getOrderList(AppPageVo vo) { + PageResult dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.lambdaQuery().eq(DishOrderDO::getUserId, vo.getUserId())); PageResult appOrderRespVOPageResult = BeanUtils.toBean(dishOrderDOPageResult, AppOrderRespVO.class); for (AppOrderRespVO dishOrderDO : appOrderRespVOPageResult.getList()){ List appOrderDetailRespVOS = orderDetailService.selectListByOrderId(dishOrderDO.getId());