From 884f5c68ac8c738f90f1ca257605cfbb5d7f12db Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 六月 2024 09:09:27 +0800
Subject: [PATCH] 提交【管理后台】-工作台接口

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 3ca2dd1..324d2ba 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
@@ -455,7 +455,13 @@
                 memberOrderDTO1.setMemberId(order.getMemberId());
                 memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
                 Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
-                Integer num1=num+order.getGoodsQuantity();
+                Integer num1=0;
+                if (num!=null){
+                    num1 =num+order.getGoodsQuantity();
+                }else{
+                    num1=order.getGoodsQuantity();
+                }
+
                 GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                 GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
                 if (data.getLimitNumber()<=num1){
@@ -1192,4 +1198,16 @@
             }
         }
     }
+
+    /**
+     * 查询统计订单列表
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return List<Order>
+     */
+    @Override
+    public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {
+        return baseMapper.getStaticsOrderList(startTime, endTime);
+    }
 }

--
Gitblit v1.7.1