From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 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 7e330b0..69ef878 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
@@ -3,20 +3,18 @@
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.MemberInvoiceOrder;
+import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
-import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
-import com.ruoyi.order.domain.pojo.Order;
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>
@@ -29,8 +27,6 @@
@Service
public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService {
- @Resource
- private IMemberInvoiceRiseService iMemberInvoiceRiseService;
@Resource
private IOrderService iOrderService;
@@ -42,22 +38,18 @@
wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(MemberInvoiceRise::getDelFlag,0);
wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
- Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, 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();
}
- LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
- wrapper.eq(MemberInvoiceRise::getDelFlag,0);
- wrapper.eq(MemberInvoiceRise::getIsDefault,2);
- MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+
memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -67,36 +59,38 @@
memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount());
memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen());
memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
+ memberInvoiceRise.setMemberId(memberInvoiceRiseDTO.getMemberId());
+ memberInvoiceRise.setIsDefault(1);
- if (memberInvoiceRise1==null){
- memberInvoiceRise.setIsDefault(2);
- }
- iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise);
- }
+ this.saveOrUpdate(memberInvoiceRise);
+ }
@Override
public void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
- LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
- wrapper.eq(MemberInvoiceRise::getDelFlag,0);
- wrapper.eq(MemberInvoiceRise::getIsDefault,2);
- MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
- memberInvoiceRise1.setIsDefault(1);
- iMemberInvoiceRiseService.updateById(memberInvoiceRise1);
- MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+
+ LambdaQueryWrapper<MemberInvoiceRise> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper1.eq(MemberInvoiceRise::getDelFlag,0);
+ wrapper1.eq(MemberInvoiceRise::getIsDefault,2);
+ MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1);
+ if(memberInvoiceRise2!=null){
+ memberInvoiceRise2.setIsDefault(1);
+ this.updateById(memberInvoiceRise2);
+ }
+ 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
@@ -105,7 +99,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);
return memberInvoiceRise1;
}
@@ -116,9 +110,9 @@
wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(Order::getOrderStatus,4);
wrapper.eq(Order::getDelFlag,0);
+ wrapper.gt(Order::getTotalAmount,0);
List<Integer> list=new ArrayList<>();
if (memberInvoiceRiseDTO.getOrderType()==1){
- list.add(2);
list.add(3);
wrapper.in(Order::getInvoiceStatus,list);
}else{
@@ -126,6 +120,7 @@
list.add(4);
wrapper.in(Order::getInvoiceStatus,list);
}
+ wrapper.eq(Order::getIsRequest,1);
Page<Order> page1 = iOrderService.page(page, wrapper);
return PageDTO.of(page1);
--
Gitblit v1.7.1