From c9c63baa6aca084be7a9302f240c080c9ab1454b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:46:50 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 e68d5a8..c342857 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
@@ -237,9 +237,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")
@@ -249,9 +252,12 @@
@PostMapping("/byShopIdAndUserId")
public R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
- .eq(Order::getShopId, shopId)
+ .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 +512,19 @@
orderService.updateById(order);
return R.ok();
}
+
+
+ /**
+ * 获取用户订单数量
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/getOrderCountByAppUserId")
+ public R<Long> getOrderCountByAppUserId(@RequestParam("id") Long appUserId){
+ long count = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getDelFlag, 0)
+ .eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8))
+ .eq(Order::getPayStatus, 2));
+ return R.ok(count);
+ }
}
--
Gitblit v1.7.1