From 6e8a55edef22faa7f7d5bbbccd727119a6fd918f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 14:05:08 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
index 16765b6..c2a9f3d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
+++ b/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>
@@ -26,25 +27,25 @@
@Service
public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService {
- @Resource
- private IMemberInvoiceRiseService iMemberInvoiceRiseService;
@Resource
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 = this.page(page, wrapper);
+ return PageDTO.of(page1);
}
@Override
public void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
- MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
if (memberInvoiceRise==null){
memberInvoiceRise=new MemberInvoiceRise();
}
@@ -52,7 +53,7 @@
wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(MemberInvoiceRise::getDelFlag,0);
wrapper.eq(MemberInvoiceRise::getIsDefault,2);
- MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+ MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);
memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -66,7 +67,7 @@
if (memberInvoiceRise1==null){
memberInvoiceRise.setIsDefault(2);
}
- iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise);
+ this.saveOrUpdate(memberInvoiceRise);
}
@Override
@@ -75,23 +76,23 @@
wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(MemberInvoiceRise::getDelFlag,0);
wrapper.eq(MemberInvoiceRise::getIsDefault,2);
- MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+ MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);
memberInvoiceRise1.setIsDefault(1);
- iMemberInvoiceRiseService.updateById(memberInvoiceRise1);
+ this.updateById(memberInvoiceRise1);
- MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
memberInvoiceRise.setIsDefault(2);
- iMemberInvoiceRiseService.updateById(memberInvoiceRise);
+ this.updateById(memberInvoiceRise);
}
@Override
public void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
- iMemberInvoiceRiseService.removeById(memberInvoiceRiseDTO.getId());
+ this.removeById(memberInvoiceRiseDTO.getId());
}
@Override
public MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
- return iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ return this.getById(memberInvoiceRiseDTO.getId());
}
@Override
@@ -100,12 +101,13 @@
wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(MemberInvoiceRise::getDelFlag,0);
wrapper.eq(MemberInvoiceRise::getIsDefault,2);
- MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+ MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);
return memberInvoiceRise1;
}
@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 +122,9 @@
list.add(4);
wrapper.in(Order::getInvoiceStatus,list);
}
- return iOrderService.list(wrapper);
+ Page<Order> page1 = iOrderService.page(page, wrapper);
+ return PageDTO.of(page1);
+
}
--
Gitblit v1.7.1