From 1529842471c8c07a5181a10404b6dff2a0944500 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 06 八月 2024 09:00:22 +0800
Subject: [PATCH] 8.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 11 ++++++++---
1 files changed, 8 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 03c86ed..0692eb5 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
@@ -270,6 +270,7 @@
+// @RequiresPermissions({"reassignment_edit","order_edit"})
@ApiOperation(value = "订单列表-编辑", tags = {"后台-订单管理"})
@PostMapping(value = "/edit")
@@ -278,7 +279,10 @@
Site site = siteService.lambdaQuery()
.eq(Site::getId, order.getSiteId())
.eq(Site::getIsDelete, 0).one();
- order.setSiteName(site.getSiteName());
+ if (null != site) {
+ order.setSiteName(site.getSiteName());
+ }
+
// 师傅信息
if (null != order.getServerId()) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
@@ -299,6 +303,7 @@
}else {
order.setOrderMoney(one.getRecoveryPrice());
}
+ order.setServeName(recoveryServe.getServeName());
// 后台订单
order.setType(Constants.ONE);
Boolean data = orderClient.edit(order).getData();
@@ -419,8 +424,8 @@
@ApiOperation(value = "ocr识别", tags = {"后台-首页"})
@PostMapping (value = "/ocr")
- public R<AddressDto> ocr(OcrBase ocrBase) {
- return R.ok(DescribeInstances.orcr(ocrBase.getBase()));
+ public R<AddressDto> ocr(String ocrAddress) {
+ return R.ok(DescribeInstances.ocr(ocrAddress));
}
/**
--
Gitblit v1.7.1