From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 e170096..e897242 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,12 +44,12 @@
public class OrderController {
private final IOrderService orderService;
+ private final PromotionClient promotionClient;
@PostMapping("/saveOrderOne")
@ResponseBody
@InnerAuth
- public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
- orderService.saveOrderOne(OrderDTO);
- return R.ok();
+ public R<Long> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
+ return R.ok(orderService.saveOrderOne(OrderDTO));
}
@@ -169,6 +170,13 @@
return R.ok(orderService.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO));
}
+ @InnerAuth
+ @ResponseBody
+ @PostMapping("/getOrderByGroupPurchaseMemberList1")
+ R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+ return R.ok(orderService.getOrderByGroupPurchaseMemberList1(homeGoodsSkuDTO));
+ }
+
/**
@@ -228,4 +236,28 @@
orderService.updateOrderStatusByMubres1(formedGroupMubres);
return R.ok();
}
+
+ @InnerAuth
+ @PostMapping("/updOrderStatusByMubres2")
+ R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ 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