From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 124 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 53 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..5a19bde 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,18 +4,24 @@
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;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ReceiptPaymentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
@@ -35,18 +41,46 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+ @Autowired
+ private InvoiceLedgerMapper invoiceLedgerMapper;
+
/**
* 鍥炴鐧昏鏂板
- * @param receiptPayment
+ * @param receiptPaymentList
* @return
*/
@Override
- public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
- if(null==receiptPayment.getId()){
- return receiptPaymentMapper.insert(receiptPayment);
- }else {
- return receiptPaymentMapper.updateById(receiptPayment);
+ @Transactional(rollbackFor = Exception.class)
+ public int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPaymentList) {
+ for (ReceiptPayment receiptPayment : receiptPaymentList) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ receiptPayment = this.getById(receiptPayment.getId());
+ }
+// InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectById(byId.getInvoiceLedgerId());
+ SalesLedger salesLedger = salesLedgerMapper.selectById(receiptPayment.getSalesLedgerId());
+ if(null==salesLedger) throw new RuntimeException("鏈壘鍒伴攢鍞崟");
+ // 宸插洖娆鹃噾棰�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(receiptPayment.getSalesLedgerProductId());
+ if(null==salesLedgerProduct) throw new RuntimeException("鏈壘鍒伴攢鍞崟浜у搧");
+ if (salesLedgerProduct.getPendingInvoiceTotal().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
+ if(null==receiptPayment.getId()){
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(receiptPayment.getReceiptPaymentAmount()));
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ receiptPaymentMapper.insert(receiptPayment);
+ }else {
+ BigDecimal subtract = receiptPayment.getReceiptPaymentAmount().subtract(byId.getReceiptPaymentAmount());
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(subtract));
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ receiptPaymentMapper.updateById(receiptPayment);
+ }
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
}
+ return 1;
}
/**
@@ -138,9 +172,25 @@
@Override
public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
- if (receiptPaymentDto.getStatus()) {
- receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
- }
+// if (receiptPaymentDto.getStatus()) {
+// long count = receiptPaymentDtoIPage.getRecords()
+// .stream()
+// .filter(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()))
+// .count();
+// receiptPaymentDtoIPage
+// .getRecords()
+// .removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
+// receiptPaymentDtoIPage.setTotal(receiptPaymentDtoIPage.getTotal() - count);
+// }
+ receiptPaymentDtoIPage.getRecords().forEach(item -> {
+ // 姣旇緝鍥炴閲戦 == 寰呭洖娆鹃噾棰�
+ if (item.getInvoiceTotal().compareTo(item.getReceiptPaymentAmountTotal()) == 0) {
+ item.setStatusName("宸插畬鎴愬洖娆�");
+ }else{
+ item.setStatusName("鏈畬鎴愬洖娆�");
+ }
+
+ });
return receiptPaymentDtoIPage;
}
@@ -206,47 +256,8 @@
* @return
*/
@Override
- public List<CustomerInteractionDto> customerInteractions(ReceiptPaymentDto receiptPaymentDto) {
- ArrayList<CustomerInteractionDto> result = new ArrayList<>();
- List<CustomerInteractionDto> customerInteractionDtos = receiptPaymentMapper.customerInteractions(receiptPaymentDto);
- if(CollectionUtils.isEmpty(customerInteractionDtos)){
- return result;
- }
- // 搴旀敹鎬婚噾棰濋噾棰濊绠�
- BigDecimal amountTotal = BigDecimal.ZERO;
- Map<LocalDate, List<CustomerInteractionDto>> dateListMap = customerInteractionDtos.stream().collect(
- Collectors.groupingBy(
- CustomerInteractionDto::getHappenTime,
- LinkedHashMap::new,
- Collectors.toList()
- )
- );
- for (LocalDate localDate : dateListMap.keySet()) {
- BigDecimal currentReceiptAmount = BigDecimal.ZERO;
- BigDecimal invoiceAmount = BigDecimal.ZERO;
- BigDecimal currentDateTotal = BigDecimal.ZERO;
- List<CustomerInteractionDto> customerInteractionDtoList = dateListMap.get(localDate);
- // 璁＄畻褰撳ぉ鏀舵鏁�
- currentReceiptAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 0)
- .map(CustomerInteractionDto::getReceiptAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撳ぉ寮�绁ㄦ暟
- invoiceAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 1)
- .map(CustomerInteractionDto::getInvoiceAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撴棩姹囨��
- currentDateTotal = currentDateTotal.add(invoiceAmount).subtract(currentReceiptAmount);
- CustomerInteractionDto customerInteractionDto = new CustomerInteractionDto();
- customerInteractionDto.setHappenTime(localDate);
- customerInteractionDto.setInvoiceAmount(invoiceAmount);
- customerInteractionDto.setReceiptAmount(currentReceiptAmount);
- amountTotal = customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount());
- customerInteractionDto.setUnReceiptAmount(amountTotal);
- result.add(customerInteractionDto);
- }
- return result;
+ public List<InvoiceLedgerDto> customerInteractions(InvoiceLedgerDto receiptPaymentDto) {
+ return receiptPaymentMapper.invoiceLedgerSalesAccount(receiptPaymentDto);
}
/**
@@ -266,8 +277,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