From 4dd69a0476fc2b9e1cff291611d7e56fbe4324ec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 05 十一月 2024 11:19:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index a06e937..9ea08fb 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -421,12 +421,7 @@
@RequiresPermissions("order_reassignment")
@ApiOperation(value = "订单列表-订单派单/改派", tags = {"后台-订单管理"})
@PostMapping(value = "/reassignment")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "操作类型(1:订单派单；2:订单改派)", name = "type", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "服务人员id", name = "workerId", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
- })
+
@Transactional(rollbackFor = Exception.class)
public R<String> reassignment(@RequestBody OrderReasinDto orderReasinDto) {
// String[] split = orderIds.split(",");
@@ -443,11 +438,22 @@
if (Constants.TWO.equals(orderId.getType())) {
if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
orderClient.updateState(order.getId(), Constants.ONE);
+
+ //如果是待改派,将上门时间设置为最新的，并且更新再投原因
+ if (order.getState().equals(Constants.SIX)){
+ dispatchClient.changeReason(order.getId(), orderReasinDto.getReason());
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+ }
+
}
// 订单状态为 待完工时，需要更改状态 待上门且清空师傅到达预约点时间
if (order.getState().equals(Constants.TWO)) {
orderClient.updateStateAndArrivalTime(orderId.getOrderId(), Constants.ONE);
}
+
+
+
+
// 生成改派信息
// ChangeDispatch changeDispatch = new ChangeDispatch();
// changeDispatch.setWorkerId(item.getServerId());
--
Gitblit v1.7.1