From d4f159d60acf6f263bfa4508a113c0feacd2f5b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 六月 2024 18:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index 3277c38..c357396 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -25,6 +25,8 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import io.seata.common.util.StringUtils;
+
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -77,8 +79,9 @@
memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone());
memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
- this.save(memberInvoice);
+ BigDecimal pice=new BigDecimal(0.0);
+ this.save(memberInvoice);
List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
for (Long memberInvoiceOrder:memberInvoiceOrderList){
MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
@@ -92,7 +95,10 @@
OrderName=order.getSkuName();
memberInvoiceOrder1.setOrderName(OrderName);
iMemberInvoiceOrderService.save(memberInvoiceOrder1);
+ pice.add(order.getTotalAmount());
}
+ memberInvoice.setInvoiceMoney(pice);
+ this.updateById(memberInvoice);
}
@Override
@@ -208,5 +214,18 @@
memberInvoice.setRemark(dto.getRemark());
}
this.updateById(memberInvoice);
+ // 更新关联订单状态
+ List<MemberInvoiceOrder> memberInvoiceOrderList = iMemberInvoiceOrderService.lambdaQuery()
+ .eq(MemberInvoiceOrder::getInvoiceId, memberInvoice)
+ .list();
+ Set<Long> orderIdSet = memberInvoiceOrderList.stream()
+ .map(MemberInvoiceOrder::getOrderId)
+ .collect(Collectors.toSet());
+ if (!orderIdSet.isEmpty()) {
+ iOrderService.lambdaUpdate()
+ .set(Order::getInvoiceStatus, dto.getInvoiceStatus() == 2 ? 3 : 4)
+ .in(Order::getId, orderIdSet).update();
+ }
+
}
}
--
Gitblit v1.7.1