From 8d738d847973e1184a704b5ca3d4f492bffdb03f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:01:37 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 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 980c2d7..438c931 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
@@ -88,6 +88,22 @@
 
     }
 
+    @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));
+
+    }
+
 
     /**
      * 获取某个商品的已购会员数
@@ -136,6 +152,13 @@
     @PostMapping("/getOrderByGroupPurchaseMemberId1")
     R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
         return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
+    }
+
+    @InnerAuth
+    @ResponseBody
+    @PostMapping("/getOrderByGroupPurchaseMemberId2")
+    R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+        return R.ok(orderService.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO));
     }
 
 
@@ -193,4 +216,16 @@
         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();
+    }
 }

--
Gitblit v1.7.1