From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 48aae1e..c425808 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
@@ -12,12 +12,13 @@
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.MgtPromotionWishRecommendVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
+import com.ruoyi.system.api.feignClient.PromotionClient;
import java.util.Collection;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -43,10 +44,11 @@
public class OrderController {
private final IOrderService orderService;
+ private final PromotionClient promotionClient;
@PostMapping("/saveOrderOne")
@ResponseBody
@InnerAuth
- public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
+ public R<Long> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
orderService.saveOrderOne(OrderDTO);
return R.ok();
@@ -247,4 +249,16 @@
orderService.updateOrderStatusByMubres2(formedGroupMubres);
return R.ok();
}
+
+ /**
+ * 根据skuId获取心愿求购详情数据
+ *
+ * @param id
+ * @return
+ */
+ @InnerAuth
+ @GetMapping("/getWishDataBySkuId/{id}")
+ R<MgtPromotionWishRecommendVO> getWishDataBySkuId(@PathVariable("id") Long id) {
+ return R.ok(orderService.getWishDataBySkuId(id));
+ }
}
--
Gitblit v1.7.1