From cb3e2e445ff0ac7eaaead90def0b9959235d6aa8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 04 八月 2025 15:19:47 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java |    2 +-
 src/main/java/com/zy/asrs/controller/ReviewController.java          |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ReviewController.java b/src/main/java/com/zy/asrs/controller/ReviewController.java
index bb93522..f2af395 100644
--- a/src/main/java/com/zy/asrs/controller/ReviewController.java
+++ b/src/main/java/com/zy/asrs/controller/ReviewController.java
@@ -10,6 +10,7 @@
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.Review;
+import com.zy.asrs.entity.ReviewDetl;
 import com.zy.asrs.importexcle.ImportReviewDto;
 import com.zy.asrs.importexcle.ImportReviewListener;
 import com.zy.asrs.mapper.ReviewDetlMapper;
@@ -117,4 +118,14 @@
         return R.ok();
     }
 
+
+    @RequestMapping(value = "/review/delete/auth")
+    @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+    @Transactional
+    public R delete(@RequestParam Long orderId){
+        Review review = reviewService.selectById(orderId);
+        reviewDetlService.delete(new EntityWrapper<ReviewDetl>().eq("order_id", orderId));
+        reviewService.deleteById(orderId);
+        return R.ok();
+    }
 }
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index b18c58f..4baef0c 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -46,7 +46,7 @@
 
     public ReturnT<String> start2() {
         List<Review> settleEqual6 = reviewService.selectList(new EntityWrapper<Review>()
-                .eq("settle", 6));
+                .in("settle", 4,6));
         for (Review order : settleEqual6) {
             List<ReviewDetl> orderDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>()
                     .eq("order_no", order.getOrderNo()));

--
Gitblit v1.9.1