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 | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 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 29b2341..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
@@ -3,8 +3,8 @@
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.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
@@ -59,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);
@@ -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));
}
@@ -131,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));
}
@@ -159,8 +196,50 @@
* @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));
}
+ @InnerAuth
+ @GetMapping("/autoCancelOrder/{id}")
+ R<?> autoCancelOrder(@PathVariable("id") Long oid) {
+ Order byId = orderService.getById(oid);
+ if (byId.getOrderStatus().getCode()==1){
+ byId.setOrderStatus(OrderStatusEnum.CANCELED);
+ orderService.updateById(byId);
+ }
+ 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) {
+ orderService.updateOrderStatusByMubres2(formedGroupMubres);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1