bug修改

mitao

2024-06-27 93004b6af39ba122c8cc74ed729ac7f44532b6e2

 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){
@@ -878,9 +884,11 @@
        }
        page = this.lambdaQuery()
                .in(StringUtils.isNotEmpty(memberIdSet), Order::getMemberId, memberIdSet)
                .ne(query.getQueryType().equals(OrderTypeEnum.MALL_ODER), Order::getOrderFrom,
                .ne(StringUtils.isNotNull(query.getQueryType()) && query.getQueryType()
                                .equals(OrderTypeEnum.MALL_ODER), Order::getOrderFrom,
                        OrderFromEnum.AUCTION_ORDERS)
                .eq(query.getQueryType().equals(OrderTypeEnum.AUCTION_ORDER), Order::getOrderFrom,
                .eq(StringUtils.isNotNull(query.getQueryType()) && query.getQueryType()
                                .equals(OrderTypeEnum.AUCTION_ORDER), Order::getOrderFrom,
                        OrderFromEnum.AUCTION_ORDERS)
                .like(StringUtils.isNotBlank(query.getOrderNo()), Order::getOrderNo,
                        query.getOrderNo())
@@ -1192,4 +1200,16 @@
            }
        }
    }

    /**
     * 查询统计订单列表
     *
     * @param startTime 开始时间
     * @param endTime   结束时间
     * @return List<Order>
     */
    @Override
    public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {
        return baseMapper.getStaticsOrderList(startTime, endTime);
    }
}