From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 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 bbb2faf..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
@@ -1,6 +1,5 @@
package com.ruoyi.order.controller;
-import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -11,23 +10,34 @@
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
-
-import com.ruoyi.order.entity.*;
+import com.ruoyi.order.entity.ChangeDispatch;
+import com.ruoyi.order.entity.Evaluate;
+import com.ruoyi.order.entity.Order;
+import com.ruoyi.order.entity.ServeCoordinate;
+import com.ruoyi.order.entity.ServeRecord;
import com.ruoyi.order.request.OrderCountDataRequest;
import com.ruoyi.order.request.OrderRequest;
import com.ruoyi.order.request.OrderSubmitRequest;
import com.ruoyi.order.request.UserOrderRequest;
-import com.ruoyi.order.service.*;
-import com.ruoyi.order.vo.*;
+import com.ruoyi.order.service.ChangeDispatchService;
+import com.ruoyi.order.service.EvaluateService;
+import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.service.ServeCoordinateService;
+import com.ruoyi.order.service.ServeRecordService;
+import com.ruoyi.order.vo.MoneyQueryRequest;
+import com.ruoyi.order.vo.OrderCountRequest;
+import com.ruoyi.order.vo.OrderCountVO;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderPageCountVO;
+import com.ruoyi.order.vo.OrderQueryRequest;
+import com.ruoyi.order.vo.OrderResultVO;
+import com.ruoyi.order.vo.WorkerOrderCountVO;
+import com.ruoyi.order.vo.WorkerOrderRankVO;
import com.ruoyi.user.api.feignClient.UserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@@ -36,6 +46,14 @@
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -88,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));
+ }
/**
* 订单列表
*/
@@ -118,6 +140,16 @@
return R.ok();
}
+ /**
+ * 增加发送短信次数
+ * @param orderId 订单id
+ */
+ @ApiOperation(value = "订单列表-增加发送短信次数", tags = {"后台-订单管理"})
+ @PostMapping(value = "/msgCount")
+ public R messageCount(@RequestParam("orderId") String orderId) {
+ orderService.messageCount(orderId);
+ return R.ok();
+ }
@ApiOperation(value = "订单列表-获取入库单", tags = {"后台-订单管理"})
@PostMapping(value = "/papercount")
public R<List<PaperInVo>> inpaper(@RequestParam("workId") String workId,@RequestParam("date") String date) {
@@ -247,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);
+ }
+
/**
* 更改订单信息
@@ -274,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);
}
@@ -350,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);
@@ -359,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());
@@ -456,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()));
}
/**
@@ -470,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();
}
/**
@@ -536,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);
}
@@ -550,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