产品线申请——产看当前订单下的所有明细

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -127,18 +126,9 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
      * @param orderDetialsVO 需要提供参数（付款状态，页数，每页条数默认显示10条）
      * @return 所有订单明细
      */
-    public Page getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
         OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
-        Long curren = orderDetialsVO.getCurrent();
-        Long size =orderDetialsVO.getSize();
-        if(curren==null || curren==0){
-            orderDetialsVO.setCurrent(1L);
-        }
-        if (size==null || size==0){
-            orderDetialsVO.setSize(10L);
-        }
         BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
-        orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
         List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
         List<Long> list1 =new ArrayList<>();
         for (OrderDetailsWapper orderDetails:list) {
@@ -164,12 +154,6 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                 }
             }
         }
-        Page page =new Page();
-        page.setRecords(list);
-        orderDetailsIndex =new OrderDetailsIndex();
-        page.setCurrent(orderDetialsVO.getCurrent());
-        page.setSize(orderDetialsVO.getSize());
-        page.setTotal(this.seleAllOrderDetials(orderDetailsIndex).size());
-        return page;
+        return list;
     }
 }

diagbotman-service/src/main/java/com/diagbot/vo/OrderDetialsVO.java

@@ -3,8 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Description:
  * @author: wangyu
@@ -13,13 +11,6 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class OrderDetialsVO {
-    @NotBlank(message = "请输入页数!")
-    private Long current;
-    @NotBlank(message = "请输入每页显示条数!")
-    private Long size;
-    @NotBlank(message = "请输入订单状态（0.未付款1.已付款）!")
-    private Integer status;
-
     /**
      * 订单编号
      */

diagbotman-service/src/main/java/com/diagbot/web/DiagOrderDetailsController.java

@@ -1,9 +1,9 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.OrderDetailsFacade;
 import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.OrderDetialsVO;
@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 订单明细 前端控制器
  * @Author: wangyu
@@ -29,13 +31,11 @@ public class DiagOrderDetailsController {
     private OrderDetailsFacade orderDetailsFacade;
 
     @ApiOperation(value = "产品申请——显示[by:wangyu]",
-            notes = "current:页数<br>" +
-                    "size:每页显示条数<br>" +
-                    "status:订单状态（0.未付款1.已付款）" )
+            notes = "orderNum:订单编号<br>")
     @PostMapping("/getAllOrderDetials")
     @SysLogger("getAllOrderDetials")
-    public RespDTO<Page> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
-        Page list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
+        List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
         return RespDTO.onSuc(list);
     }