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 |   77 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 5 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 980c2d7..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));
 
     }
 
@@ -77,7 +78,7 @@
 
         LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
         wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
-        wrapper.eq(Order::getOrderStatus,4);
+        wrapper.eq(Order::getOrderFrom,4);
         wrapper.eq(Order::getAuctionOrderType,1 );
         wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
         wrapper.eq(Order::getDelFlag,0);
@@ -85,6 +86,22 @@
         Order page1 = orderService.getOne(wrapper);
 
         return R.ok(page1);
+
+    }
+
+    @PostMapping("/getOrderOne2")
+    @ResponseBody
+    @InnerAuth
+    public R<Order> getOrderOne2(@RequestBody OrderDTO OrderDTO) {
+
+        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+        wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
+        wrapper.eq(Order::getOrderFrom,OrderDTO.getOrderFrom());
+        wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
+        wrapper.eq(Order::getDelFlag,0);
+        wrapper.orderByDesc(Order::getCancelTime);
+        List<Order> list = orderService.list(wrapper);
+        return R.ok(list.get(0));
 
     }
 
@@ -138,12 +155,26 @@
         return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
     }
 
+    @InnerAuth
+    @ResponseBody
+    @PostMapping("/getOrderByGroupPurchaseMemberId2")
+    R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+        return R.ok(orderService.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO));
+    }
+
 
     @InnerAuth
     @ResponseBody
     @PostMapping("/getOrderByGroupPurchaseMemberList")
     R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
         return R.ok(orderService.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO));
+    }
+
+    @InnerAuth
+    @ResponseBody
+    @PostMapping("/getOrderByGroupPurchaseMemberList1")
+    R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+        return R.ok(orderService.getOrderByGroupPurchaseMemberList1(homeGoodsSkuDTO));
     }
 
 
@@ -193,4 +224,40 @@
         orderService.updateOrderStatusByMubres(formedGroupMubres);
         return R.ok();
     }
+
+    @InnerAuth
+    @PostMapping("/updOrderStatusByMubres1")
+    R<?> updateOrderStatusByMubres1(@RequestBody String formedGroupMubres) {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        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