From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 554b959..f468f8b 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
@@ -419,12 +419,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(",");
@@ -439,13 +434,25 @@
// 订单派单
boolean result = true;
if (Constants.TWO.equals(orderId.getType())) {
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
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(), "");
+ }
+
}
// 订单状态为 待完工时，需要更改状态 待上门且清空师傅到达预约点时间
if (order.getState().equals(Constants.TWO)) {
orderClient.updateStateAndArrivalTime(orderId.getOrderId(), Constants.ONE);
}
+
+
+
+
// 生成改派信息
// ChangeDispatch changeDispatch = new ChangeDispatch();
// changeDispatch.setWorkerId(item.getServerId());
@@ -461,6 +468,9 @@
// changeDispatch.setUserName(item.getReservationName());
// changeDispatch.setIsDelete(Constants.ZERO);
// result = dispatchClient.saveRecord(changeDispatch).getData();
+ }else {
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
}
ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
@@ -759,17 +769,7 @@
public R<String> importTemplate(HttpServletResponse response) throws Exception {
List<FrozenBuckleImportDTO> list = new ArrayList<>();
FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
- bean.setSiteName("站点名称");
- bean.setServeName("服务信息");
- bean.setReservationName("预约姓名");
- bean.setReservationPhone("预约电话");
- bean.setProvince("省份");
- bean.setCity("市");
- bean.setArea("区");
- bean.setReservationAddress("详细地址");
- bean.setCustClass("上门时间");
- bean.setServerName("服务人员");
- bean.setReservationRemark("备注");
+
list.add(bean);
// 这里URLEncoder.encode可以防止中文乱码
@@ -825,7 +825,7 @@
// 设置sheet,默认读取第一个
.sheet()
// 设置标题(字段列表)所在行数
- .headRowNumber(2)
+ .headRowNumber(1)
.doRead();
System.err.println(successArrayList);
--
Gitblit v1.7.1