From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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..3387e9f 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
@@ -77,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);
@@ -85,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));
}
@@ -138,12 +154,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 +223,23 @@
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) {
+ orderService.updateOrderStatusByMubres2(formedGroupMubres);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1