From c9d31309ddeb908bf29dde58392e15cc977c6d7d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 四月 2025 17:28:28 +0800
Subject: [PATCH] 提现

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index dd33eb8..b080f34 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -106,6 +106,10 @@
         return R.ok(orderService.queryPage(orderQueryRequest));
     }
 
+    @PostMapping(value = "/queryPage1")
+    public R<List<String>> queryPage1(@RequestBody OrderQueryRequest orderQueryRequest) {
+        return R.ok(orderService.queryPage1(orderQueryRequest));
+    }
     /**
      * 订单列表
      */
@@ -142,7 +146,7 @@
      */
     @ApiOperation(value = "订单列表-增加发送短信次数", tags = {"后台-订单管理"})
     @PostMapping(value = "/msgCount")
-    public R<?> messageCount(@RequestParam("orderId") String orderId) {
+    public R messageCount(@RequestParam("orderId") String orderId) {
         orderService.messageCount(orderId);
         return R.ok();
     }
@@ -275,6 +279,12 @@
         return R.ok(collect);
     }
 
+    @PostMapping(value = "/queryIdsBycodeAndSite")
+    public R<List<Integer>> queryIdsBycodeAndSite(@RequestParam("cityList")  List<String> cityList,@RequestParam("siteIds")List<String> siteIds) {
+        List<Integer> collect = orderService.lambdaQuery().eq(BaseEntity::getIsDelete,0).in(!siteIds.isEmpty(),Order::getSiteId,siteIds).in(Order::getCityCode, cityList).list().stream().map(Order::getUserId).collect(Collectors.toList());
+        return R.ok(collect);
+    }
+
 
     /**
      * 更改订单信息
@@ -302,6 +312,8 @@
             order.setServerPhone(phone);
             orderService.updateById(order);
         }
+//        List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, orderId).list();
+//        changeDispatchService.removeBatchByIds(list);
         return R.ok(order);
     }
 
@@ -378,7 +390,7 @@
 
 
         Order order = orderService.getById(orderRequest.getOrderId());
-        if (order.getState()!=6) {
+//        if (order.getState()!=6) {
             if ((!Objects.equals(order.getServerId(), orderRequest.getServerId())) || (!Objects.equals(order.getTime(), orderRequest.getTime()))) {
                 order.setState(1);
                 order.setArriveTime(null);
@@ -387,8 +399,12 @@
                         .eq(Order::getId, order.getId()
                         ).set(Order::getArriveTime, null).update();
 
+                //删除改派管理的订单
+//                List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, order.getId()).list();
+//                changeDispatchService.removeBatchByIds(list);
+
             }
-        }
+//        }
 
         order.setId(orderRequest.getOrderId());
         order.setCity(orderRequest.getCity());
@@ -484,7 +500,7 @@
     })
     public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest request) {
         return R.ok(orderService.orderCount(request.getWorkerName(), request.getWorkerPhone(), request.getCityList(),
-                Page.of(request.getPageNum(), request.getPageSize())));
+                Page.of(request.getPageNum(), request.getPageSize()),request.getSiteIds()));
     }
 
     /**
@@ -498,6 +514,14 @@
                 .eq(Order::getUserId, userId)
                 .eq(Order::getIsDelete, Constants.ZERO).list();
         return R.ok(!list.isEmpty());
+    }
+
+    @GetMapping(value = "/updateArrivalTime")
+    public R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime) {
+        Order byId = orderService.getById(orderId);
+        byId.setTime(arriveTime);
+        orderService.updateById(byId);
+        return R.ok();
     }
 
     /**
@@ -564,9 +588,12 @@
     @GetMapping(value = "/orderList1")
     public R<Page<Order>> orderList1(@RequestParam("userId") Integer userId, @RequestParam("cityList") List<String> cityList,
                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                     @RequestParam("siteIds") List<String> siteIds
+    ) {
         Page<Order> page = orderService.lambdaQuery().eq(Order::getUserId, userId)
-                .eq(Order::getIsDelete, 0).in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
+                .eq(Order::getIsDelete, 0)
+                .in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
         return R.ok(page);
     }
 
@@ -578,9 +605,9 @@
     })
     public R<Page<Order>> workOrderList(@RequestParam("workId") Integer workId,
                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam("siteIds") String [] siteIds) {
         Page<Order> page = orderService.lambdaQuery().eq(Order::getServerId, workId)
-                .eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize));
+                .in(siteIds.length>0,Order::getSiteId, siteIds).eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize));
         return R.ok(page);
     }
 

--
Gitblit v1.7.1