From adeef693ffeb030db6e1dbad186d55171da5fa39 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 14:44:18 +0800
Subject: [PATCH] 8.10
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 0692eb5..b4c8dd9 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
@@ -1,6 +1,7 @@
package com.ruoyi.admin.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.netty.NettyChannelMap;
@@ -333,8 +334,11 @@
@ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
})
@Transactional(rollbackFor = Exception.class)
- public R<String> reassignment(@RequestParam Integer type, @RequestParam String orderId,
+ public R<String> reassignment(@RequestParam Integer type, @RequestParam String orderIds,
@RequestParam Integer workerId, String applyReason) {
+ String[] split = orderIds.split(",");
+ for (String orderId : split) {
+
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, workerId)
.eq(MasterWorker::getIsDelete, 0).one();
@@ -376,7 +380,9 @@
// } catch (IOException e) {
// return R.fail("订单推送失败！");
// }
- return result ? R.ok() : R.fail();
+ }
+
+ return R.ok() ;
}
/**
@@ -424,7 +430,7 @@
@ApiOperation(value = "ocr识别", tags = {"后台-首页"})
@PostMapping (value = "/ocr")
- public R<AddressDto> ocr(String ocrAddress) {
+ public R<JSONObject> ocr(String ocrAddress) {
return R.ok(DescribeInstances.ocr(ocrAddress));
}
--
Gitblit v1.7.1