修改bug

rentaiming

2024-07-09 7a0f7e715ffacab8851de10abcf6b857ca84a263

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -676,6 +676,7 @@

    @Override
    public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {

        Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
@@ -753,7 +754,8 @@
            OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
                    Wrappers.lambdaQuery(OrderReturnRequest.class)
                            .eq(OrderReturnRequest::getOrderId,
                                    orderVO.getId()).last("limit 1"));
                                    orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
                                    0).last("limit 1"));
            if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
                orderVO.setStatus(orderReturnRequest.getStatus());
                orderVO.setRequestId(orderReturnRequest.getId());
@@ -989,6 +991,32 @@

    @Override
    public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {


        LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
        wrapper1.eq(Order::getOrderStatus,1);
        wrapper1.eq(Order::getIsOrder,1);
        wrapper1.eq(Order::getDelFlag,0);
        wrapper1.orderByDesc(Order::getCancelTime);
        List<Order> page2 = this.list(wrapper1);
        for (Order MemberOrderList:page2) {
            if (MemberOrderList.getOrderStatus().getCode() == 1) {
                if (MemberOrderList.getOrderFrom().getCode() == 1 || MemberOrderList.getOrderFrom().getCode() == 2 || MemberOrderList.getOrderFrom().getCode() == 3) {
                    LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
                    if (LocalDateTime.now().isAfter(localDateTime)) {
                        // dateTime1 在 dateTime2 之后
                        MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
                        Order order = this.getById(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);
                        this.updateById(order);
                    }

                }
            }
        }


        MemberOrderNumVO vo=new MemberOrderNumVO();

        LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery();