From 179c9d6b6a98292e4e2bec9a01c620d38d13c54a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 05 七月 2025 16:37:17 +0800
Subject: [PATCH] 质量不合格添加productId字段+删除库存模块代码
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 8f04726..135d3b0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
@@ -246,7 +247,19 @@
customerInteractionDto.setUnReceiptAmount(amountTotal);
result.add(customerInteractionDto);
}
- return result;
+ ArrayList<CustomerInteractionDto> newResult = new ArrayList<>();
+ for (int i = 0; i < result.size(); i++) {
+ CustomerInteractionDto customerInteractionDto = result.get(i);
+ if (i == 0) {
+ customerInteractionDto.setUnReceiptAmount(customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount()));
+ }else {
+ CustomerInteractionDto customerInteractionDto1 = result.get(i-1);
+ customerInteractionDto.setUnReceiptAmount(customerInteractionDto1.getUnReceiptAmount()
+ .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()));
+ }
+ newResult.add(customerInteractionDto);
+ }
+ return newResult;
}
/**
@@ -266,8 +279,15 @@
@Override
public void exportPaymentList(HttpServletResponse response, List<Long> ids) {
- List<ReceiptPaymentExeclDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(ids);
- ExcelUtil<ReceiptPaymentExeclDto> util = new ExcelUtil<ReceiptPaymentExeclDto>(ReceiptPaymentExeclDto.class);
- util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ if (ids == null) {
+ List<ReceiptPaymentExeclDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(new ArrayList<>(), SecurityUtils.getLoginUser().getTenantId());
+ ExcelUtil<ReceiptPaymentExeclDto> util = new ExcelUtil<ReceiptPaymentExeclDto>(ReceiptPaymentExeclDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }else {
+ List<ReceiptPaymentExeclDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(ids,SecurityUtils.getLoginUser().getTenantId());
+ ExcelUtil<ReceiptPaymentExeclDto> util = new ExcelUtil<ReceiptPaymentExeclDto>(ReceiptPaymentExeclDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }
+
}
}
--
Gitblit v1.9.3