From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 27 五月 2024 08:44:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java index 83dec48..ac3f033 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java +++ b/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> -- Gitblit v1.7.1