From 2e71bdbcdf853bb35e68016b84f0254f7366bfeb Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:28 +0800
Subject: [PATCH] 文件工具类变更
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index d1ec847..fefe144 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,38 +12,38 @@
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto;
-import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.InvoiceRegistrationService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class InvoiceRegistrationServiceImpl extends ServiceImpl<InvoiceRegistrationMapper, InvoiceRegistration> implements InvoiceRegistrationService {
- @Autowired
- private InvoiceRegistrationMapper invoiceRegistrationMapper;
+ private final InvoiceRegistrationMapper invoiceRegistrationMapper;
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private InvoiceLedgerMapper invoiceLedgerMapper;
+ private final InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 寮�绁ㄧ櫥璁拌褰曟柊澧�
@@ -85,18 +84,16 @@
throw new RuntimeException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪锛孖D锛�" + productDatum.getId());
}
- // 璁＄畻绱寮�绁�
- BigDecimal newInvoiceNum = dbProduct.getInvoiceNum().add(currentInvoiceNum);
+ // 鏈紑绁�
+ BigDecimal noInvoiceAmount = dbProduct.getNoInvoiceAmount();
+ BigDecimal noInvoiceNum = dbProduct.getNoInvoiceNum();
- BigDecimal newInvoiceAmount = dbProduct.getInvoiceAmount().add(currentInvoiceAmount);
+ // 鍓╀綑鏈紑绁�
+ BigDecimal newNoInvoiceNum = noInvoiceNum.subtract(currentInvoiceNum);
+ BigDecimal newNoInvoiceAmount = noInvoiceAmount.subtract(currentInvoiceAmount);
- // 璁＄畻鏈紑绁�
- BigDecimal newNoInvoiceNum = dbProduct.getQuantity().subtract(newInvoiceNum);
- BigDecimal newNoInvoiceAmount = dbProduct.getTaxInclusiveTotalPrice().subtract(newInvoiceAmount);
-
- if (newNoInvoiceNum.compareTo(BigDecimal.ZERO) < 0
- || newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
+ if (newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException("寮�绁ㄦ暟閲忔垨閲戦瓒呰繃鍚堝悓鎬婚噺");
}
@@ -105,8 +102,6 @@
null,
new LambdaUpdateWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getId, dbProduct.getId())
- .set(SalesLedgerProduct::getInvoiceNum, newInvoiceNum)
- .set(SalesLedgerProduct::getInvoiceAmount, newInvoiceAmount)
.set(SalesLedgerProduct::getNoInvoiceNum, newNoInvoiceNum)
.set(SalesLedgerProduct::getNoInvoiceAmount, newNoInvoiceAmount)
);
--
Gitblit v1.9.3