From 1044d3cdd5acdfec56120dc176a52fcec26c4f57 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期三, 17 七月 2024 19:13:00 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 22 +++++++++++++++++++++- 1 files changed, 21 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 29b2341..94410aa 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 @@ -4,7 +4,9 @@ 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; @@ -59,7 +61,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); @@ -131,6 +133,13 @@ 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 @@ -163,4 +172,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