From b87e2975c597d67d7a419a63e1d0166b3d4ad1d3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 12 七月 2024 17:53:17 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 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 2afa63a..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,13 +1,21 @@
 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;
 import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
 import com.ruoyi.system.api.domain.dto.OrderDTO;
 import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
+import java.util.Collection;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +28,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+
 
 /**
  * <p>
@@ -42,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);
 
     }
 
@@ -82,6 +127,22 @@
         return R.ok(orderService.getOrderByGroupPurchaseId(id));
     }
 
+    @InnerAuth
+    @ResponseBody
+    @PostMapping("/getOrderByGroupPurchaseMemberId")
+    R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+        return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
+    }
+
+    @InnerAuth
+    @ResponseBody
+    @PostMapping("/getOrderByGroupPurchaseMemberList")
+    R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+        return R.ok(orderService.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO));
+    }
+
+
+
     /**
      * 批量更新订单状态
      *
@@ -93,4 +154,26 @@
         orderService.updateBatchById(orders);
         return R.ok();
     }
+
+    /**
+     * 根据优惠券id集合查询订单列表
+     *
+     * @param couponIds 优惠券id集合
+     * @return List<Order>
+     */
+    @PostMapping("/order/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();
+    }
+
 }

--
Gitblit v1.7.1