From 5740c7c1f04e4ebe8925d2c8e490bc235ba1c453 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 17:47:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 520643c..e2a57af 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -2,12 +2,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.OrderStatusEnum;
-import com.ruoyi.order.domain.pojo.Order;
-import com.ruoyi.order.domain.pojo.OrderMall;
+import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.util.OrderUtil;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import java.util.List;
import java.util.Set;
@@ -27,8 +27,7 @@
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
- @Resource
- private IOrderService orderService;
+
@Resource
private IOrderMallService orderMallService;
@Override
@@ -48,8 +47,15 @@
order.setReceiverCity(OrderDTO.getReceiverCity());
order.setReceiverDetailAddress(OrderDTO.getReceiverDetailAddress());
order.setBound(OrderDTO.getBound());
- orderService.save(order);
+ this.save(order);
}
+
+ /**
+ * 获取某个商品的已购会员数
+ *
+ * @param id 秒杀商品id
+ * @return 已购会员数
+ */
@Override
public Integer getSeckillMembers(Long id) {
return baseMapper.getSeckillMembers(id);
@@ -72,4 +78,15 @@
OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
}
+
+ /**
+ * 根据团购商品id获取团购商品订单
+ *
+ * @param id 团购商品id
+ * @return 订单列表
+ */
+ @Override
+ public List<Order> getOrderByGroupPurchaseId(Long id) {
+ return baseMapper.getOrderByGroupPurchaseId(id);
+ }
}
--
Gitblit v1.7.1