From 0449a6264819bce3869f47b9e5bd3729f158db54 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 14 三月 2025 16:05:24 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
index 56ad3e3..a75d800 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderGoodService;
+import com.ruoyi.order.service.OrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -24,6 +28,8 @@
public class OrderGoodController extends BaseController {
@Resource
private OrderGoodService orderGoodService;
+ @Resource
+ private OrderService orderService;
/**
* 查询指定商品订单
@@ -37,8 +43,28 @@
}
@GetMapping("/getOrderListByUserIdAndGoodsId")
- public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId){
+ public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId){
return R.ok(orderGoodService.getOrderListByUserIdAndGoodsId(userId, goodsId));
}
+
+
+ /**
+ * 获取指定用户未分销的订单
+ */
+ @PostMapping("/getUnDistributedOrder")
+ public R<List<OrderGood>> getUnDistributedOrder(@RequestBody List<Long> appUserIds) {
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
+ .in(Order::getAppUserId, appUserIds)
+ .eq(Order::getIsCommission, 0)
+ .eq(Order::getDelFlag, 0));
+ if(list.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+
+ List<Long> orderIds = list.stream().map(Order::getId).collect(Collectors.toList());
+ List<OrderGood> orderGoods = orderGoodService.list(new LambdaQueryWrapper<OrderGood>()
+ .in(OrderGood::getOrderId, orderIds));
+ return R.ok(orderGoods);
+ }
}
--
Gitblit v1.7.1