From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 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 f01f4a8..c3f726e 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
@@ -1,7 +1,12 @@
package com.ruoyi.order.controller.inner;
+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;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
@@ -46,6 +51,42 @@
public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
orderService.saveOrderOne(OrderDTO);
return R.ok();
+
+ }
+
+ @PostMapping("/getOrderOne")
+ @ResponseBody
+ @InnerAuth
+ public R<Order> getOrderOne(@RequestBody OrderDTO OrderDTO) {
+
+ LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
+ wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getAuctionOrderType,2 );
+ wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
+ wrapper.eq(Order::getDelFlag,0);
+ wrapper.orderByDesc(Order::getCancelTime);
+ Order page1 = orderService.getOne(wrapper);
+
+ return R.ok(page1);
+
+ }
+
+ @PostMapping("/getOrderOne1")
+ @ResponseBody
+ @InnerAuth
+ public R<Order> getOrderOne1(@RequestBody OrderDTO OrderDTO) {
+
+ LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
+ wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getAuctionOrderType,1 );
+ wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
+ wrapper.eq(Order::getDelFlag,0);
+ wrapper.orderByDesc(Order::getCancelTime);
+ Order page1 = orderService.getOne(wrapper);
+
+ return R.ok(page1);
}
@@ -124,4 +165,15 @@
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();
+ }
+
}
--
Gitblit v1.7.1