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/MemberInvoiceRiseServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 a299696..51085f9 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,15 +49,7 @@
if (memberInvoiceRise==null){
memberInvoiceRise=new MemberInvoiceRise();
}
- if (memberInvoiceRiseDTO.getIsDefault()==2){
- 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);
- memberInvoiceRise2.setIsDefault(1);
- this.updateById(memberInvoiceRise2);
- }
+
memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -67,7 +59,8 @@
memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount());
memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen());
memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
- memberInvoiceRise.setIsDefault(memberInvoiceRiseDTO.getIsDefault());
+ memberInvoiceRise.setMemberId(memberInvoiceRiseDTO.getMemberId());
+ memberInvoiceRise.setIsDefault(1);
this.saveOrUpdate(memberInvoiceRise);
}
@@ -81,9 +74,10 @@
wrapper1.eq(MemberInvoiceRise::getDelFlag,0);
wrapper1.eq(MemberInvoiceRise::getIsDefault,2);
MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1);
- memberInvoiceRise2.setIsDefault(1);
- this.updateById(memberInvoiceRise2);
-
+ if(memberInvoiceRise2!=null){
+ memberInvoiceRise2.setIsDefault(1);
+ this.updateById(memberInvoiceRise2);
+ }
MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
memberInvoiceRise.setIsDefault(2);
this.updateById(memberInvoiceRise);
@@ -116,6 +110,7 @@
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);
--
Gitblit v1.7.1