From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index dffe6d2..4cfea56 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -31,6 +31,7 @@
import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -237,9 +238,12 @@
public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
List<Order> list = orderService.lambdaQuery()
.eq(Order::getAppUserId, appUserId)
- .eq(Order::getShopId, shopId)
+ .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
.eq(Order::getDistributionMode, 1)
- .ne(Order::getOrderStatus,5).list();
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
return R.ok(list);
}
@PostMapping("/byShopId")
@@ -251,7 +255,10 @@
List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
.eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
.eq(Order::getAppUserId, appUserId)
- .in(Order::getOrderStatus, 4, 7, 8).list();
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
return R.ok(list);
}
@@ -506,5 +513,13 @@
orderService.updateById(order);
return R.ok();
}
+
+
+ /**
+ * 导入物流信息
+ */
+ @PostMapping("/importExpress")
+ public R importExpress(@RequestParam("file") MultipartFile file){
+ }
}
--
Gitblit v1.7.1