From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 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 c2a9f3d..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
@@ -49,11 +49,7 @@
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= this.getOne(wrapper);
+
memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -63,23 +59,25 @@
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);
- }
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= this.getOne(wrapper);
- memberInvoiceRise1.setIsDefault(1);
- this.updateById(memberInvoiceRise1);
+
+ 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);
this.updateById(memberInvoiceRise);
@@ -112,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{
@@ -122,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