From 18c2d9bb34e3e13f33612d0b879136bd5ec0c339 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 12:41:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4741832..6c1d2e7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -356,14 +356,14 @@
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
-// Order order = orderService.selectById(orderId);
-// if (order != null) {
-// order.setStatus(0);
-// }
-// if (!orderService.updateById(order)) {
-// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
-// }
-// orderDetlService.modifyStatus(orderId, 0);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/report/auth")
+ @ManagerAuth(memo = "鎵嬪姩涓婁紶璁㈠崟")
+ @Transactional
+ public R report(@RequestParam Long orderId){
+ orderService.report(orderId,getUserId());
return R.ok();
}
@@ -441,9 +441,9 @@
Row row = sheet.getRow(i);
// 璁㈠崟缂栧彿
String uuid = dataFormatter.formatCellValue(row.getCell(0));
- // 鍟嗗搧鍚嶇О
+ // 鐗╂枡鍙�
String maktx = dataFormatter.formatCellValue(row.getCell(1));
- // 鍟嗗搧缂栫爜
+ // 鐗╂枡鍙�
String matnr = dataFormatter.formatCellValue(row.getCell(2));
// 鏁伴噺
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
--
Gitblit v1.9.1