From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java | 7 ++++++-
1 files changed, 6 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 bfc843d..d370ac7 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,8 +4,8 @@
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.OrderGood;
import com.ruoyi.order.service.OrderGoodService;
-import com.ruoyi.model.OrderGood;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -35,5 +35,10 @@
.in(OrderGood::getGoodsId, goodsIds));
return R.ok(orderGoods);
}
+
+ @GetMapping("/getOrderListByUserIdAndGoodsId")
+ public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId){
+ return R.ok(orderGoodService.getOrderListByUserIdAndGoodsId(userId, goodsId));
+ }
}
--
Gitblit v1.7.1