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/MemberInvoiceServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 4f0fdee..4feb7e1 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
@@ -34,6 +34,7 @@
import javax.annotation.Resource;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -65,6 +66,11 @@
private MemberClient memberClient;
@Override
public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
+ List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
+ if (memberInvoiceOrderList.size()==0){
+ throw new ServiceException("无开票订单");
+ }
+
MemberInvoice memberInvoice =new MemberInvoice();
memberInvoice.setMemberId(memberInvoiceDTO.getMemberId());
memberInvoice.setInvoiceMoney(memberInvoiceDTO.getInvoiceMoney());
@@ -78,14 +84,12 @@
memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone());
memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
-
- BigDecimal pice=new BigDecimal(0.0);
this.save(memberInvoice);
- List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
- for (Long memberInvoiceOrder:memberInvoiceOrderList){
+ Double pice=0.00;
+ for (int i=0;i<memberInvoiceOrderList.size();i++){
MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
- Order order= iOrderService.getById(memberInvoiceOrder);
- order.setInvoiceStatus(1);
+ Order order= iOrderService.getById(memberInvoiceOrderList.get(i));
+ order.setInvoiceStatus(2);
iOrderService.updateById(order);
memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
@@ -94,9 +98,10 @@
OrderName=order.getSkuName();
memberInvoiceOrder1.setOrderName(OrderName);
iMemberInvoiceOrderService.save(memberInvoiceOrder1);
- pice.add(order.getTotalAmount());
+ pice=pice+order.getTotalAmount().doubleValue();
}
- memberInvoice.setInvoiceMoney(pice);
+
+ memberInvoice.setInvoiceMoney(new BigDecimal(pice));
this.updateById(memberInvoice);
}
@@ -204,6 +209,7 @@
* @param dto 管理后台-开票申请审核数据传输对象
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void audit(MgtMemberInvoicingAuditDTO dto) {
MemberInvoice memberInvoice = getMemberInvoice(dto.getId());
if (!Objects.equals(memberInvoice.getInvoiceStatus(), 1)) {
@@ -218,13 +224,13 @@
List<MemberInvoiceOrder> memberInvoiceOrderList = iMemberInvoiceOrderService.lambdaQuery()
.eq(MemberInvoiceOrder::getInvoiceId, memberInvoice)
.list();
- Set<Long> orderIdSet = memberInvoiceOrderList.stream()
- .map(MemberInvoiceOrder::getOrderId)
+ Set<String> orderNoSet = memberInvoiceOrderList.stream()
+ .map(MemberInvoiceOrder::getOrderNo)
.collect(Collectors.toSet());
- if (!orderIdSet.isEmpty()) {
+ if (!orderNoSet.isEmpty()) {
iOrderService.lambdaUpdate()
.set(Order::getInvoiceStatus, dto.getInvoiceStatus() == 2 ? 3 : 4)
- .in(Order::getId, orderIdSet).update();
+ .in(Order::getOrderNo, orderNoSet).update();
}
}
--
Gitblit v1.7.1