优化

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<PageResult<AppOrderRespVO>> getOrderPage(PageParam vo) {
+    public CommonResult<PageResult<AppOrderRespVO>> getOrderPage(AppPageVo vo) {
         PageResult<AppOrderRespVO> orderList = orderService.getOrderList(vo);
         return success(orderList);
     }

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 <description class purpose>
+ * @since 2024/4/11
+ */
+@Data
+public class AppPageVo  extends PageParam {
+
+    private Long userId;
+}

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<AppOrderRespVO> getOrderList(PageParam vo);
+    PageResult<AppOrderRespVO> getOrderList(AppPageVo vo);
 
 
     /**

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<AppOrderRespVO> getOrderList(PageParam vo) {
+    public  PageResult<AppOrderRespVO> getOrderList(AppPageVo vo) {
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        PageResult<DishOrderDO> dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.<DishOrderDO>lambdaQuery().eq(DishOrderDO::getUserId, vo.getUserId()));
-        PageResult<DishOrderDO> dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.<DishOrderDO>lambdaQuery().eq(DishOrderDO::getUserId, loginUserId));
         PageResult<AppOrderRespVO> appOrderRespVOPageResult = BeanUtils.toBean(dishOrderDOPageResult, AppOrderRespVO.class);
         for (AppOrderRespVO dishOrderDO : appOrderRespVOPageResult.getList()){
             List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(dishOrderDO.getId());