修改用户订单列表

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderQsOprateController.java

@@ -63,8 +63,7 @@ public class PosOrderQsOprateController extends BaseController {
         JwtUtil jwtUtil = new JwtUtil();
         PayPush push = new PayPush();
         String qsId = jwtUtil.getusid(token);
-        PosOrder order = posOrderService.getOne(
-                new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
+        PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
         if (order == null) {
             throw new ServiceException(MessageUtils.message("no.order.not.found"));
         }
@@ -92,8 +91,7 @@ public class PosOrderQsOprateController extends BaseController {
         JwtUtil jwtUtil = new JwtUtil();
         PayPush push = new PayPush();
         String qsId = jwtUtil.getusid(token);
-        PosOrder order = posOrderService.getOne(
-                new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
+        PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
         if (order == null) {
             throw new ServiceException(MessageUtils.message("no.order.not.found"));
         }
@@ -117,8 +115,7 @@ public class PosOrderQsOprateController extends BaseController {
         JwtUtil jwtUtil = new JwtUtil();
         PayPush push = new PayPush();
         String qsId = jwtUtil.getusid(token);
-        PosOrder order = posOrderService.getOne(
-                new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
+        PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
         if (order == null) {
             throw new ServiceException(MessageUtils.message("no.order.not.found"));
         }
@@ -265,24 +262,16 @@ public class PosOrderQsOprateController extends BaseController {
     @Anonymous
     @Auth
     @GetMapping("/orderList")
-    public AjaxResult orderList(@RequestHeader String token,
-                                @RequestParam(defaultValue = "1") int page,
-                                @RequestParam(defaultValue = "10") int size,
-                                @RequestParam String tab,
-                                @RequestParam(required = false) java.math.BigDecimal longitude,
-                                @RequestParam(required = false) java.math.BigDecimal latitude) {
+    public AjaxResult orderList(@RequestHeader String token, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(required = false) String tab, @RequestParam(required = false) java.math.BigDecimal longitude, @RequestParam(required = false) java.math.BigDecimal latitude) {
         JwtUtil jwtUtil = new JwtUtil();
         String qsId = jwtUtil.getusid(token);
         Long riderId = Long.valueOf(qsId);
 
         LambdaQueryWrapper<PosOrder> wrapper = new LambdaQueryWrapper<>();
-
+        wrapper.eq(PosOrder::getIsDisplay,true);
         switch (tab) {
             case "newTask":
-                wrapper.eq(PosOrder::getType, 0L)
-                       .eq(PosOrder::getDeliveryStatus, 0L)
-                       .eq(PosOrder::getState, 2L)
-                       .eq(PosOrder::getAfterSaleStatus, 0L);
+                wrapper.eq(PosOrder::getType, 0L).eq(PosOrder::getDeliveryStatus, 0L).eq(PosOrder::getState, 2L).eq(PosOrder::getAfterSaleStatus, 0L);
                 if (longitude != null && latitude != null) {
                     wrapper.last("ORDER BY ST_Distance_Sphere(point(longitude, latitude), point(" + longitude + ", " + latitude + ")) ASC");
                 } else {
@@ -290,48 +279,27 @@ public class PosOrderQsOprateController extends BaseController {
                 }
                 break;
             case "toPickup":
-                wrapper.eq(PosOrder::getDeliveryStatus, 1L)
-                       .eq(PosOrder::getQsId, riderId)
-                       .eq(PosOrder::getAfterSaleStatus, 0L)
-                       .orderByAsc(PosOrder::getCretim);
+                wrapper.eq(PosOrder::getDeliveryStatus, 1L).eq(PosOrder::getQsId, riderId).eq(PosOrder::getAfterSaleStatus, 0L).orderByAsc(PosOrder::getCretim);
                 break;
             case "delivering":
-                wrapper.eq(PosOrder::getDeliveryStatus, 2L)
-                       .eq(PosOrder::getQsId, riderId)
-                       .eq(PosOrder::getAfterSaleStatus, 0L)
-                       .orderByAsc(PosOrder::getCretim);
+                wrapper.eq(PosOrder::getDeliveryStatus, 2L).eq(PosOrder::getQsId, riderId).eq(PosOrder::getAfterSaleStatus, 0L).orderByAsc(PosOrder::getCretim);
                 break;
             case "completed":
-                wrapper.eq(PosOrder::getState, 3L)
-                       .eq(PosOrder::getAfterSaleStatus, 0L)
-                       .eq(PosOrder::getQsId, riderId)
-                       .orderByDesc(PosOrder::getCretim);
+                wrapper.eq(PosOrder::getState, 3L).eq(PosOrder::getAfterSaleStatus, 0L).eq(PosOrder::getQsId, riderId).orderByDesc(PosOrder::getCretim);
                 break;
             case "cancelled":
-                wrapper.eq(PosOrder::getState, 4L)
-                       .eq(PosOrder::getQsId, riderId)
-                       .eq(PosOrder::getAfterSaleStatus, 0L)
-                       .orderByDesc(PosOrder::getCretim);
+                wrapper.eq(PosOrder::getState, 4L).eq(PosOrder::getQsId, riderId).eq(PosOrder::getAfterSaleStatus, 0L).orderByDesc(PosOrder::getCretim);
                 break;
             case "refund":
-                wrapper.gt(PosOrder::getAfterSaleStatus, 0L)
-                       .eq(PosOrder::getQsId, riderId)
-                       .orderByDesc(PosOrder::getCretim);
+                wrapper.gt(PosOrder::getAfterSaleStatus, 0L).eq(PosOrder::getQsId, riderId).orderByDesc(PosOrder::getCretim);
                 break;
             default:
-                throw new ServiceException("无效的tab参数");
+                break;
         }
 
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<PosOrder> pageParam =
-                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<PosOrder> pageParam = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PosOrder> result = posOrderService.page(pageParam, wrapper);
-
-        java.util.Map<String, Object> data = new java.util.LinkedHashMap<>();
-        data.put("records", result.getRecords());
-        data.put("total", result.getTotal());
-        data.put("page", page);
-        data.put("size", size);
-        return success(data);
+        return success(result);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderShOprateController.java

@@ -188,16 +188,14 @@ public class PosOrderShOprateController extends BaseController {
     public AjaxResult orderList(@RequestHeader String token,
                                 @RequestParam(defaultValue = "1") int page,
                                 @RequestParam(defaultValue = "10") int size,
-                                @RequestParam String tab,
-                                @RequestParam Long mdId,
+                                @RequestParam(required = false) String tab,
+                                @RequestParam(required = false) Long mdId,
                                 @RequestParam(required = false) String type) {
         LambdaQueryWrapper<PosOrder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PosOrder::getMdId, mdId);
-
+        wrapper.eq(mdId != null, PosOrder::getMdId, mdId);
         if (type != null && !type.isEmpty()) {
             wrapper.eq(PosOrder::getType, Long.valueOf(type));
         }
-
         switch (tab) {
             case "pending":
                 wrapper.eq(PosOrder::getState, 0L)
@@ -219,7 +217,7 @@ public class PosOrderShOprateController extends BaseController {
                 wrapper.gt(PosOrder::getAfterSaleStatus, 0L);
                 break;
             default:
-                throw new ServiceException("无效的tab参数");
+               break;
         }
         wrapper.orderByDesc(PosOrder::getCretim);
 
@@ -227,12 +225,7 @@ public class PosOrderShOprateController extends BaseController {
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PosOrder> result = posOrderService.page(pageParam, wrapper);
 
-        java.util.Map<String, Object> data = new java.util.LinkedHashMap<>();
-        data.put("records", result.getRecords());
-        data.put("total", result.getTotal());
-        data.put("page", page);
-        data.put("size", size);
-        return success(data);
+        return success(result);
     }
 
 }