Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

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

@@ -2,18 +2,19 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IOrderService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import com.ruoyi.system.api.domain.Order;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>
@@ -33,12 +34,14 @@
    private IOrderService iOrderService;

    @Override
    public List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        Page<MemberInvoiceRise> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
        return  iMemberInvoiceRiseService.list(wrapper);
        Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override
@@ -105,7 +108,8 @@
    }

    @Override
    public List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        Page<Order> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(Order::getOrderStatus,4);
@@ -120,7 +124,9 @@
            list.add(4);
            wrapper.in(Order::getInvoiceStatus,list);
        }
        return iOrderService.list(wrapper);
        Page<Order> page1 = iOrderService.page(page, wrapper);
        return PageDTO.of(page1);

    }