From 5b8e83c5170e570b9247946e799556b53445c458 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 15:17:09 +0800
Subject: [PATCH] feat(sales): 实现销售台账自动开票回款功能

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |  326 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 227 insertions(+), 99 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index c8da4ca..b2ef118 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.sales.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -8,6 +9,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.pojo.AccountIncome;
 import com.ruoyi.account.service.AccountIncomeService;
 import com.ruoyi.basic.mapper.CustomerMapper;
 import com.ruoyi.basic.mapper.ProductMapper;
@@ -31,14 +33,18 @@
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
 import com.ruoyi.quality.mapper.QualityInspectMapper;
 import com.ruoyi.sales.dto.*;
 import com.ruoyi.sales.mapper.*;
 import com.ruoyi.sales.pojo.*;
 import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.sales.service.ReceiptPaymentService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,69 +82,41 @@
 @RequiredArgsConstructor
 @Slf4j
 public class SalesLedgerServiceImpl extends ServiceImpl<SalesLedgerMapper, SalesLedger> implements ISalesLedgerService {
-    private final AccountIncomeService accountIncomeService;
-
-    private final SalesLedgerMapper salesLedgerMapper;
-
-    private final CustomerMapper customerMapper;
-
-    private final SalesLedgerProductMapper salesLedgerProductMapper;
-    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
-
-    private final CommonFileMapper commonFileMapper;
-
-    private final TempFileMapper tempFileMapper;
-
-    private final ReceiptPaymentMapper receiptPaymentMapper;
-
-    private final ShippingInfoServiceImpl shippingInfoServiceImpl;
-
-    private final CommonFileServiceImpl commonFileService;
-
-    private final ShippingInfoMapper shippingInfoMapper;
-
-    private final InvoiceLedgerMapper invoiceLedgerMapper;
-
-    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;
-
-    private final SalesLedgerWorkMapper salesLedgerWorkMapper;
-
-    private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
-
-    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
-
-    private final InvoiceRegistrationMapper invoiceRegistrationMapper;
-
-    private final ProductOrderMapper productOrderMapper;
-
-    private final ProcessRouteMapper processRouteMapper;
-    private final ProductProcessRouteMapper productProcessRouteMapper;
-
-    private final ProcessRouteItemMapper processRouteItemMapper;
-
-    private final ProductProcessRouteItemMapper productProcessRouteItemMapper;
-
-    private final ProductWorkOrderMapper productWorkOrderMapper;
-
-    private final ProductionProductMainMapper productionProductMainMapper;
-
-    private final ProductionProductOutputMapper productionProductOutputMapper;
-
-    private final ProductionProductInputMapper productionProductInputMapper;
-
-    private final QualityInspectMapper qualityInspectMapper;
-
-    @Autowired
-    private SysDeptMapper sysDeptMapper;
-
-    @Value("${file.upload-dir}")
-    private String uploadDir;
-
     private static final String LOCK_PREFIX = "contract_no_lock:";
     private static final long LOCK_WAIT_TIMEOUT = 10; // 閿佺瓑寰呰秴鏃舵椂闂达紙绉掞級
     private static final long LOCK_EXPIRE_TIME = 30;  // 閿佽嚜鍔ㄨ繃鏈熸椂闂达紙绉掞級
-
+    private final AccountIncomeService accountIncomeService;
+    private final SalesLedgerMapper salesLedgerMapper;
+    private final CustomerMapper customerMapper;
+    private final SalesLedgerProductMapper salesLedgerProductMapper;
+    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
+    private final CommonFileMapper commonFileMapper;
+    private final TempFileMapper tempFileMapper;
+    private final ReceiptPaymentMapper receiptPaymentMapper;
+    private final ShippingInfoServiceImpl shippingInfoServiceImpl;
+    private final CommonFileServiceImpl commonFileService;
+    private final ShippingInfoMapper shippingInfoMapper;
+    private final InvoiceLedgerMapper invoiceLedgerMapper;
+    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;
+    private final SalesLedgerWorkMapper salesLedgerWorkMapper;
+    private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+    private final InvoiceRegistrationMapper invoiceRegistrationMapper;
+    private final ProductOrderMapper productOrderMapper;
+    private final ProcessRouteMapper processRouteMapper;
+    private final ProductProcessRouteMapper productProcessRouteMapper;
+    private final ProcessRouteItemMapper processRouteItemMapper;
+    private final ProductProcessRouteItemMapper productProcessRouteItemMapper;
+    private final ProductWorkOrderMapper productWorkOrderMapper;
+    private final ProductionProductMainMapper productionProductMainMapper;
+    private final ProductionProductOutputMapper productionProductOutputMapper;
+    private final ProductionProductInputMapper productionProductInputMapper;
+    private final QualityInspectMapper qualityInspectMapper;
     private final RedisTemplate<String, String> redisTemplate;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+    @Value("${file.upload-dir}")
+    private String uploadDir;
     @Autowired
     private ProductModelMapper productModelMapper;
 
@@ -148,19 +126,50 @@
     private ProductStructureMapper productStructureMapper;
     @Autowired
     private ProductionProductMainService productionProductMainService;
+    @Autowired
+    private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
     ;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Autowired
+    private ReceiptPaymentService receiptPaymentService;
 
     @Override
     public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
         return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
     }
 
-
-    public List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(Long relateId, SaleEnum type){
+    public List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(Long relateId, SaleEnum type) {
         LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
         productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, relateId);
         productWrapper.eq(SalesLedgerProduct::getType, type.getCode());
         return salesLedgerProductMapper.selectList(productWrapper);
+    }
+
+    @Override
+    public List<SalesLedgerProduct> getSalesLedgerProductListByIds(@Nullable List<Long> relateIds, SaleEnum type) {
+        if (CollectionUtils.isEmpty(relateIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
+        productWrapper.in(SalesLedgerProduct::getId, relateIds);
+        productWrapper.eq(SalesLedgerProduct::getType, type.getCode());
+        List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(productWrapper);
+        if (type.equals(SaleEnum.PURCHASE)) {
+            // 鏌ヨ閫�璐т俊鎭�
+            List<Long> productIds = salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
+            List<SimpleReturnOrderGroupDto> groupListByProductIds = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(productIds)){
+                groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
+            }
+            Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getSalesLedgerProductId, SimpleReturnOrderGroupDto::getSumReturnQuantity));
+            salesLedgerProducts.forEach(item -> {
+                BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+                item.setReturnQuality(returnQuality);
+                item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
+            });
+        }
+        return salesLedgerProducts;
     }
 
     @Override
@@ -334,9 +343,6 @@
         return salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
     }
 
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult importData(MultipartFile file) {
@@ -405,6 +411,7 @@
                 salesLedgerMapper.insert(salesLedger);
 
 
+                List<SalesLedgerProduct> insertedProducts = new ArrayList<>();
                 for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                     SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                     BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
@@ -436,9 +443,12 @@
                     salesLedgerProduct.setApproveStatus(0);
                     salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                     salesLedgerProductMapper.insert(salesLedgerProduct);
+                    insertedProducts.add(salesLedgerProduct);
                     // 娣诲姞鐢熶骇鏁版嵁
                     salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
                 }
+                // 瀵煎叆鏃跺悓鏍疯嚜鍔ㄥ叏棰濆紑绁ㄣ�佽嚜鍔ㄥ叏棰濆洖娆�
+                autoInvoiceAndReceiptPayment(salesLedger, insertedProducts);
             }
 
             return AjaxResult.success("瀵煎叆鎴愬姛");
@@ -478,6 +488,8 @@
                         .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
                         .orderByDesc(ShippingInfo::getCreateTime)
                         .last("limit 1"));
+                product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+                product.setShippingDate(shippingInfo.getShippingDate());
                 if (shippingInfo != null) {
                     product.setShippingStatus(shippingInfo.getStatus());
                 }
@@ -492,37 +504,6 @@
 
 
         return salesLedgerDtoIPage;
-    }
-
-
-    // 鍐呴儴绫荤敤浜庡瓨鍌ㄨ仛鍚堢粨鏋�
-    private static class GroupedCustomer {
-        private final Long customerId;
-        private final String customerName;
-        private BigDecimal totalAmount = BigDecimal.ZERO;
-
-        public GroupedCustomer(Long customerId, String customerName) {
-            this.customerId = customerId;
-            this.customerName = customerName;
-        }
-
-        public void addAmount(BigDecimal amount) {
-            if (amount != null) {
-                this.totalAmount = this.totalAmount.add(amount);
-            }
-        }
-
-        public Long getCustomerId() {
-            return customerId;
-        }
-
-        public String getCustomerName() {
-            return customerName;
-        }
-
-        public BigDecimal getTotalAmount() {
-            return totalAmount;
-        }
     }
 
     /**
@@ -594,6 +575,16 @@
         if (CollectionUtils.isNotEmpty(invoiceLedgerIds)) {
             LambdaQueryWrapper<ReceiptPayment> wrapperTree = new LambdaQueryWrapper<>();
             wrapperTree.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgerIds);
+            List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(wrapperTree);
+            // 鍚屾鍒犻櫎鍥炴瀵瑰簲鐨勮储鍔℃敹鍏ヨ褰曪紝閬垮厤浜х敓瀛ゅ効鏁版嵁
+            if (CollectionUtils.isNotEmpty(receiptPayments)) {
+                List<Long> receiptPaymentIds = receiptPayments.stream()
+                        .map(item -> item.getId().longValue())
+                        .collect(Collectors.toList());
+                accountIncomeService.remove(new LambdaQueryWrapper<AccountIncome>()
+                        .in(AccountIncome::getBusinessId, receiptPaymentIds)
+                        .eq(AccountIncome::getBusinessType, 1));
+            }
             receiptPaymentMapper.delete(wrapperTree);
         }
         // 鍒犻櫎鍙戣揣鍙拌处璁板綍
@@ -632,7 +623,8 @@
             salesLedger.setCustomerName(customer.getCustomerName());
             salesLedger.setTenantId(customer.getTenantId());
             // 3. 鏂板鎴栨洿鏂颁富琛�
-            if (salesLedger.getId() == null) {
+            boolean isNew = salesLedger.getId() == null;
+            if (isNew) {
                 String contractNo = generateSalesContractNo();
                 salesLedger.setSalesContractNo(contractNo);
                 salesLedgerMapper.insert(salesLedger);
@@ -643,7 +635,7 @@
             // 4. 澶勭悊瀛愯〃鏁版嵁
             List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
             if (productList != null && !productList.isEmpty()) {
-                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class,salesLedgerDto.getType()));
+                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));
                 updateMainContractAmount(
                         salesLedger.getId(),
                         productList,
@@ -657,13 +649,16 @@
             if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {
                 migrateTempFilesToFormal(salesLedger.getId(), salesLedgerDto.getTempFileIds());
             }
+
+            // 6. 鏂板鍙拌处鏃惰嚜鍔ㄥ叏棰濆紑绁ㄣ�佽嚜鍔ㄥ叏棰濆洖娆�
+            if (isNew && productList != null && !productList.isEmpty()) {
+                autoInvoiceAndReceiptPayment(salesLedger, productList);
+            }
             return 1;
         } catch (IOException e) {
             throw new BaseException("鏂囦欢杩佺Щ澶辫触: " + e.getMessage());
         }
     }
-
-    // 鏂囦欢杩佺Щ鏂规硶
 
     /**
      * 灏嗕复鏃舵枃浠惰縼绉诲埌姝e紡鐩綍
@@ -740,6 +735,7 @@
         }
     }
 
+    // 鏂囦欢杩佺Щ鏂规硶
 
     @Override
     public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
@@ -770,6 +766,108 @@
                 salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
             }
         }
+    }
+
+    /**
+     * 鏂板閿�鍞彴璐︽椂鑷姩鍏ㄩ寮�绁ㄣ�佽嚜鍔ㄥ叏棰濆洖娆�
+     * <p>
+     * 1. 鎸夊悎鍚屽叏棰濊嚜鍔ㄧ敓鎴愬紑绁ㄧ櫥璁帮紙invoice_registration + invoice_registration_product + invoice_ledger锛夛紱
+     * 2. 鎸夊紑绁ㄥ叏棰濊嚜鍔ㄧ敓鎴愬洖娆剧櫥璁帮紙receipt_payment锛夊強璐㈠姟鏀跺叆璁板綍锛坅ccount_income锛夈��
+     *
+     * @param salesLedger 閿�鍞彴璐︿富琛紙宸插叆搴擄級
+     * @param products    鍙拌处浜у搧鍒楄〃锛堝凡鍏ュ簱锛屽惈涓婚敭ID锛�
+     */
+    private void autoInvoiceAndReceiptPayment(SalesLedger salesLedger, List<SalesLedgerProduct> products) {
+        // 浠呭鐞嗛攢鍞被浜у搧
+        List<SalesLedgerProduct> saleProducts = products.stream()
+                .filter(Objects::nonNull)
+                .filter(p -> p.getId() != null)
+                .filter(p -> SaleEnum.SALE.getCode().equals(p.getType()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(saleProducts)) {
+            return;
+        }
+
+        String register = SecurityUtils.getLoginUser().getUser().getNickName();
+
+        // 1. 鑷姩寮�绁細鐢熸垚涓�寮犲紑绁ㄧ櫥璁颁富琛紝瑕嗙洊璇ュ彴璐﹀叏閮ㄤ骇鍝�
+        InvoiceRegistration invoiceRegistration = new InvoiceRegistration();
+        invoiceRegistration.setSalesLedgerId(salesLedger.getId().intValue());
+        invoiceRegistration.setSalesContractNo(salesLedger.getSalesContractNo());
+        invoiceRegistration.setCustomerId(salesLedger.getCustomerId() == null ? null : salesLedger.getCustomerId().intValue());
+        invoiceRegistration.setSalesman(salesLedger.getSalesman());
+        invoiceRegistration.setProjectName(salesLedger.getProjectName());
+        invoiceRegistrationMapper.insert(invoiceRegistration);
+
+        List<ReceiptPayment> receiptPaymentList = new ArrayList<>();
+        for (SalesLedgerProduct product : saleProducts) {
+            BigDecimal invoiceNum = product.getQuantity();
+            BigDecimal invoiceAmount = product.getTaxInclusiveTotalPrice();
+            // 鏁伴噺鎴栭噾棰濈己澶辨椂璺宠繃锛屼笉闃绘柇鍙拌处鏂板
+            if (invoiceNum == null || invoiceAmount == null
+                    || invoiceNum.compareTo(BigDecimal.ZERO) <= 0
+                    || invoiceAmount.compareTo(BigDecimal.ZERO) <= 0) {
+                continue;
+            }
+
+            // 1.1 浜у搧鏈紑绁ㄦ暟閲�/閲戦娓呴浂锛堝叏棰濆紑绁級
+            salesLedgerProductMapper.update(
+                    null,
+                    new LambdaUpdateWrapper<SalesLedgerProduct>()
+                            .eq(SalesLedgerProduct::getId, product.getId())
+                            .set(SalesLedgerProduct::getNoInvoiceNum, BigDecimal.ZERO)
+                            .set(SalesLedgerProduct::getNoInvoiceAmount, BigDecimal.ZERO)
+            );
+
+            // 1.2 寮�绁ㄧ櫥璁颁骇鍝�
+            InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
+            BeanUtils.copyProperties(product, invoiceRegistrationProduct);
+            invoiceRegistrationProduct.setId(null);
+            invoiceRegistrationProduct.setSalesLedgerId(salesLedger.getId().intValue());
+            invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistration.getId());
+            invoiceRegistrationProduct.setSalesLedgerProductId(product.getId().intValue());
+            invoiceRegistrationProduct.setInvoiceNum(invoiceNum);
+            invoiceRegistrationProduct.setInvoiceAmount(invoiceAmount);
+            invoiceRegistrationProduct.setNoInvoiceNum(BigDecimal.ZERO);
+            invoiceRegistrationProduct.setNoInvoiceAmount(BigDecimal.ZERO);
+            invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
+
+            // 1.3 寮�绁ㄥ彴璐︼紙鍙戠エ鍙疯嚜鍔ㄧ敓鎴愶級
+            InvoiceLedger invoiceLedger = new InvoiceLedger();
+            invoiceLedger.setInvoiceDate(LocalDate.now());
+            invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
+            invoiceLedger.setInvoiceTotal(invoiceAmount);
+            invoiceLedger.setInvoiceNo(generateAutoInvoiceNo(product.getId()));
+            invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+            invoiceLedger.setInvoicePerson(register);
+            invoiceLedgerMapper.insert(invoiceLedger);
+
+            // 2. 缁勮鑷姩鍥炴璁板綍锛堟寜寮�绁ㄥ叏棰濆洖娆撅級
+            ReceiptPayment receiptPayment = new ReceiptPayment();
+            receiptPayment.setReceiptPaymentType("0");
+            receiptPayment.setReceiptPaymentAmount(invoiceAmount);
+            receiptPayment.setRegistrant(register);
+            receiptPayment.setInvoiceLedgerId(invoiceLedger.getId());
+            receiptPayment.setSalesLedgerId(salesLedger.getId());
+            receiptPayment.setSalesLedgerProductId(product.getId());
+            receiptPayment.setReceiptPaymentDate(LocalDate.now());
+            receiptPaymentList.add(receiptPayment);
+        }
+
+        // 3. 鑷姩鍥炴锛堝唴閮ㄥ悓姝ユ洿鏂颁骇鍝佸洖娆鹃噾棰濆苟鐢熸垚璐㈠姟鏀跺叆璁板綍锛�
+        if (!receiptPaymentList.isEmpty()) {
+            receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPaymentList);
+        }
+    }
+
+    /**
+     * 鐢熸垚鑷姩寮�绁ㄥ彂绁ㄥ彿
+     *
+     * @param salesLedgerProductId 閿�鍞彴璐︿骇鍝両D
+     * @return 鑷姩鍙戠エ鍙�
+     */
+    private String generateAutoInvoiceNo(Long salesLedgerProductId) {
+        return "AUTO" + System.currentTimeMillis() + salesLedgerProductId;
     }
 
     private SalesLedger convertToEntity(SalesLedgerDto dto) {
@@ -881,4 +979,34 @@
             throw new RuntimeException("鍔ㄦ�佹洿鏂颁富琛ㄩ噾棰濆け璐�", e);
         }
     }
+
+    // 鍐呴儴绫荤敤浜庡瓨鍌ㄨ仛鍚堢粨鏋�
+    private static class GroupedCustomer {
+        private final Long customerId;
+        private final String customerName;
+        private BigDecimal totalAmount = BigDecimal.ZERO;
+
+        public GroupedCustomer(Long customerId, String customerName) {
+            this.customerId = customerId;
+            this.customerName = customerName;
+        }
+
+        public void addAmount(BigDecimal amount) {
+            if (amount != null) {
+                this.totalAmount = this.totalAmount.add(amount);
+            }
+        }
+
+        public Long getCustomerId() {
+            return customerId;
+        }
+
+        public String getCustomerName() {
+            return customerName;
+        }
+
+        public BigDecimal getTotalAmount() {
+            return totalAmount;
+        }
+    }
 }

--
Gitblit v1.9.3