From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index 2afa63a..f01f4a8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -6,8 +6,11 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
+import java.util.Collection;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+
/**
* <p>
@@ -82,6 +86,22 @@
return R.ok(orderService.getOrderByGroupPurchaseId(id));
}
+ @InnerAuth
+ @ResponseBody
+ @PostMapping("/getOrderByGroupPurchaseMemberId")
+ R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+ return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
+ }
+
+ @InnerAuth
+ @ResponseBody
+ @PostMapping("/getOrderByGroupPurchaseMemberList")
+ R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+ return R.ok(orderService.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO));
+ }
+
+
+
/**
* 批量更新订单状态
*
@@ -93,4 +113,15 @@
orderService.updateBatchById(orders);
return R.ok();
}
+
+ /**
+ * 根据优惠券id集合查询订单列表
+ *
+ * @param couponIds 优惠券id集合
+ * @return List<Order>
+ */
+ @PostMapping("/order/list-by-coupon")
+ R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds) {
+ return R.ok(orderService.getOrderByCouponIds(couponIds));
+ }
}
--
Gitblit v1.7.1