From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
index d8aa76a..c35d0a3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
@@ -3,17 +3,13 @@
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceOrderMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* <p>
@@ -25,14 +21,13 @@
*/
@Service
public class MemberInvoiceOrderServiceImpl extends ServiceImpl<MemberInvoiceOrderMapper, MemberInvoiceOrder> implements IMemberInvoiceOrderService {
- @Resource
- private IMemberInvoiceOrderService iMemberInvoiceOrderService;
+
@Override
public PageDTO<MemberInvoiceOrder> getMemberInvoiceInfo(MemberInvoiceDTO memberInvoiceDTO) {
Page<MemberInvoiceOrder> page = new Page<>(memberInvoiceDTO.getPageCurr(), memberInvoiceDTO.getPageSize());
LambdaQueryWrapper<MemberInvoiceOrder> wrapper = Wrappers.lambdaQuery();
wrapper.eq(MemberInvoiceOrder::getInvoiceId, memberInvoiceDTO.getId());
- Page<MemberInvoiceOrder> page1 = iMemberInvoiceOrderService.page(page, wrapper);
+ Page<MemberInvoiceOrder> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
}
--
Gitblit v1.7.1