Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 43c263df4d8ce0cc830f287780c29db8a2b47f0f

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

@@ -3,21 +3,28 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.OrderAuction;
import com.ruoyi.order.domain.pojo.OrderMall;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.*;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.IOrderAuctionService;
import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>