From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 764fa7c..b63e90c 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,7 @@
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;
@@ -64,6 +65,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,12 +84,11 @@
memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
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());
@@ -92,7 +97,11 @@
OrderName=order.getSkuName();
memberInvoiceOrder1.setOrderName(OrderName);
iMemberInvoiceOrderService.save(memberInvoiceOrder1);
+ pice=pice+order.getTotalAmount().doubleValue();
}
+
+ memberInvoice.setInvoiceMoney(new BigDecimal(pice));
+ this.updateById(memberInvoice);
}
@Override
@@ -134,7 +143,8 @@
.in(com.ruoyi.common.core.utils.StringUtils.isNotEmpty(memberIdSet),
MemberInvoice::getMemberId, memberIdSet)
.eq(query.getInvoiceStatus() != null, MemberInvoice::getInvoiceStatus,
- query.getInvoiceStatus()).page(page);
+ query.getInvoiceStatus()).orderByDesc(MemberInvoice::getCreateTime)
+ .page(page);
if (page.getRecords().isEmpty()) {
return PageDTO.empty(page);
}
--
Gitblit v1.7.1