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 | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 94410aa..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
@@ -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;
@@ -90,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));
+
+ }
+
/**
* 获取某个商品的已购会员数
@@ -140,6 +154,13 @@
return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
}
+ @InnerAuth
+ @ResponseBody
+ @PostMapping("/getOrderByGroupPurchaseMemberId2")
+ R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+ return R.ok(orderService.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO));
+ }
+
@InnerAuth
@ResponseBody
@@ -168,7 +189,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));
}
@@ -183,4 +204,28 @@
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();
+ }
}
--
Gitblit v1.7.1