From 14e3019fb5528f19ce70fade3008ab620e3f4762 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 15:55:22 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 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 c3f726e..48aae1e 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
@@ -3,8 +3,6 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.enums.OrderStatusEnum;
 import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -61,7 +59,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,2 );
         wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
         wrapper.eq(Order::getDelFlag,0);
@@ -79,7 +77,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);
@@ -87,6 +85,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));
 
     }
 
@@ -133,12 +147,33 @@
     R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
         return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
     }
+    @InnerAuth
+    @ResponseBody
+    @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));
+    }
+
 
     @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));
     }
 
 
@@ -161,7 +196,7 @@
      * @param couponIds 优惠券id集合
      * @return List<Order>
      */
-    @PostMapping("/order/list-by-coupon")
+    @PostMapping("/list-by-coupon")
     R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds) {
         return R.ok(orderService.getOrderByCouponIds(couponIds));
     }
@@ -176,4 +211,40 @@
             return R.ok();
     }
 
+    @InnerAuth
+    @PostMapping("/getOrderListByMubres")
+    R<List<Order>> getOrderListByMubres(@RequestBody List<String> mubres) {
+        return R.ok(orderService.getOrderListByMubres(mubres));
+    }
+
+    @InnerAuth
+    @PostMapping("/updOrderStatusByMubres")
+    R<?> updateOrderStatusByMubres(@RequestBody List<String> formedGroupMubres) {
+        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();
+    }
 }

--
Gitblit v1.7.1