Merge remote-tracking branch 'origin/master'

liding

2025-05-19 e8304b5b39787b25eb024fafd00d7db512ee6438

Merge remote-tracking branch 'origin/master'

 src/main/java/com/ruoyi/basic/controller/SupplierManageController.java

@@ -85,4 +85,13 @@
    public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
        supplierService.supplierExport(response, supplierManageDto);
    }

    /**
     * ä¾›åº”商选项接口
     * @return
     */
    @GetMapping("/getOptions")
    public AjaxResult getOptions() {
        return AjaxResult.success(supplierService.list());
    }
}

 src/main/java/com/ruoyi/basic/service/ISupplierService.java

@@ -2,13 +2,14 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

public interface ISupplierService {
public interface ISupplierService extends IService<SupplierManage> {

    /**
     * ä¾›åº”商新增

 src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
package com.ruoyi.purchase.controller;

import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * ä»˜æ¬¾ç™»è®°Controller
 * 
 * @author ruoyi
 * @date 2025-05-15
 */
@RestController
@RequestMapping("/purchase/paymentRegistration")
public class PaymentRegistrationController extends BaseController
{
    @Autowired
    private IPaymentRegistrationService paymentRegistrationService;

    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°åˆ—表
     */
//    @PreAuthorize("@ss.hasPermi('system:registration:list')")
    @GetMapping("/list")
    public TableDataInfo list(PaymentRegistrationDto paymentRegistrationDto)
    {
        startPage();
        List<PaymentRegistrationDto> list = paymentRegistrationService.selectPaymentRegistrationList(paymentRegistrationDto);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä»˜æ¬¾ç™»è®°åˆ—表
     */
//    @Log(title = "付款登记", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, PaymentRegistrationDto paymentRegistrationDto)
//    {
//        List<PaymentRegistrationDto> list = paymentRegistrationService.selectPaymentRegistrationList(paymentRegistrationDto);
//        ExcelUtil<PaymentRegistration> util = new ExcelUtil<PaymentRegistration>(PaymentRegistration.class);
//        util.exportExcel(response, list, "付款登记数据");
//    }

    /**
     * èŽ·å–付款登记详细信息
     */
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(paymentRegistrationService.selectPaymentRegistrationById(id));
    }

    /**
     * æ–°å¢žä»˜æ¬¾ç™»è®°
     */
    @Log(title = "付款登记", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody PaymentRegistration paymentRegistration)
    {
        return toAjax(paymentRegistrationService.insertPaymentRegistration(paymentRegistration));
    }

    /**
     * ä¿®æ”¹ä»˜æ¬¾ç™»è®°
     */
    @Log(title = "付款登记", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration)
    {
        return toAjax(paymentRegistrationService.updatePaymentRegistration(paymentRegistration));
    }

    /**
     * åˆ é™¤ä»˜æ¬¾ç™»è®°
     */
    @Log(title = "付款登记", businessType = BusinessType.DELETE)
    @DeleteMapping("/del")
    public AjaxResult remove(@RequestBody Long[] ids)
    {
        return toAjax(paymentRegistrationService.deletePaymentRegistrationByIds(ids));
    }

    /**
     * èŽ·å–付款登记详细信息
     */
    @GetMapping(value = "/byPurchaseId/{id}")
    public AjaxResult getPurchaseInfo(@PathVariable("id") Long id)
    {
        return success(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
    }

    /**
     * èŽ·å–付款登记详细信息
     */
    @GetMapping(value = "/paymentLedgerList")
    public AjaxResult paymentLedgerList(PaymentLedgerDto paymentLedgerDto)
    {
        return success(paymentRegistrationService.selectPaymentLedgerList(paymentLedgerDto));
    }
}

 src/main/java/com/ruoyi/purchase/dto/PaymentLedgerDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.purchase.dto;

import lombok.Data;

@Data
public class PaymentLedgerDto {

    // ä¾›åº”商名称
    private String supplierName;

    // å¼€å§‹æ—¥æœŸ
    private String startDate;

    // ç»“束日期
    private String endDate;
}

 src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.ruoyi.purchase.dto;

import com.ruoyi.purchase.pojo.PaymentRegistration;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class PaymentRegistrationDto extends PaymentRegistration {

    // æŸ¥è¯¢åˆ—表查询用供应商号和合同号
    private String supplierNameOrContractNo;

    // é”€å”®åˆåŒå·
    private String salesContractNo;

    // é‡‡è´­åˆåŒå·
    private String purchaseContractNumber;

    // ä¾›åº”商名称
    private String supplierName;

    // å‘票号
    private String invoiceNumber;

    // å‘票金额
    private BigDecimal invoiceAmount;

    // å¾…付款金额
    private BigDecimal unPaymentAmount;

    // ç¨ŽçŽ‡
    private BigDecimal taxRate;
}

 src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.purchase.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * ä»˜æ¬¾ç™»è®°Mapper接口
 *
 * @author ruoyi
 * @date 2025-05-15
 */
public interface PaymentRegistrationMapper extends BaseMapper<PaymentRegistration> {
    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°
     *
     * @param id ä»˜æ¬¾ç™»è®°ä¸»é”®
     * @return ä»˜æ¬¾ç™»è®°
     */
    public PaymentRegistrationDto selectPaymentRegistrationById(@Param("id") Long id);

    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°åˆ—表
     *
     * @param paymentRegistrationDto ä»˜æ¬¾ç™»è®°
     * @return ä»˜æ¬¾ç™»è®°é›†åˆ
     */
    public List<PaymentRegistrationDto> selectPaymentRegistrationList(PaymentRegistrationDto paymentRegistrationDto);
}

 src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package com.ruoyi.purchase.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * ä»˜æ¬¾ç™»è®°å¯¹è±¡ payment_registration
 *
 * @author ruoyi
 * @date 2025-05-15
 */

@Data
@TableName("payment_registration")
public class PaymentRegistration {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * é”€å”®å°è´¦id
     */
    private Long saleLedgerId;

    /**
     * é‡‡è´­å°è´¦id
     */
    private Long purchaseLedgerId;

    /**
     * ä¾›åº”商id
     */
    private Long supplierId;

    /**
     * å‘票id
     */
    private Long invoicePurchaseId;

    /**
     * æœ¬æ¬¡ä»˜æ¬¾é‡‘额
     */
    private BigDecimal currentPaymentAmount;

    /**
     * ä»˜æ¬¾å½¢å¼
     */
    private String paymentMethod;

    /**
     * ç™»è®°äºº
     */
    private Long registrantId;

    // ç§Ÿæˆ·id
    private Long tenantId;

    /**
     * ä»˜æ¬¾æ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date paymentDate;

    /**
     * åˆ›å»ºæ—¥æœŸ
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createTime;

    /**
     * ä¿®æ”¹æ—¥æœŸ
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateTime;
}

 src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
package com.ruoyi.purchase.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;

import java.util.List;
import java.util.Map;

/**
 * ä»˜æ¬¾ç™»è®°Service接口
 *
 * @author ruoyi
 * @date 2025-05-15
 */
public interface IPaymentRegistrationService extends IService<PaymentRegistration> {
    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°
     *
     * @param id ä»˜æ¬¾ç™»è®°ä¸»é”®
     * @return ä»˜æ¬¾ç™»è®°
     */
    public PaymentRegistration selectPaymentRegistrationById(Long id);

    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°åˆ—表
     *
     * @param paymentRegistrationDto ä»˜æ¬¾ç™»è®°
     * @return ä»˜æ¬¾ç™»è®°é›†åˆ
     */
    public List<PaymentRegistrationDto> selectPaymentRegistrationList(PaymentRegistrationDto paymentRegistrationDto);

    /**
     * æ–°å¢žä»˜æ¬¾ç™»è®°
     *
     * @param paymentRegistration ä»˜æ¬¾ç™»è®°
     * @return ç»“æžœ
     */
    public int insertPaymentRegistration(PaymentRegistration paymentRegistration);

    /**
     * ä¿®æ”¹ä»˜æ¬¾ç™»è®°
     *
     * @param paymentRegistration ä»˜æ¬¾ç™»è®°
     * @return ç»“æžœ
     */
    public int updatePaymentRegistration(PaymentRegistration paymentRegistration);

    /**
     * æ‰¹é‡åˆ é™¤ä»˜æ¬¾ç™»è®°
     *
     * @param ids éœ€è¦åˆ é™¤çš„付款登记主键集合
     * @return ç»“æžœ
     */
    public int deletePaymentRegistrationByIds(Long[] ids);

    /**
     * é€šè¿‡é‡‡è´­åˆåŒå·æŸ¥è¯¢é”€å”®åˆåŒå·ï¼Œä¾›åº”商名称，发票号，发票金额，税率
     *
     * @param purchaseId é‡‡è´­åˆåŒid
     * @return ç»“æžœ
     */
    PaymentRegistration selectPaymentRegistrationByPurchaseId(Long purchaseId);

    List<Map<String, Object>> selectPaymentLedgerList(PaymentLedgerDto paymentLedgerDto);
}

 src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,246 @@
package com.ruoyi.purchase.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.mapper.InvoicePurchaseMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.InvoicePurchase;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * ä»˜æ¬¾ç™»è®°Service业务层处理
 *
 * @author ruoyi
 * @date 2025-05-15
 */
@Service
public class PaymentRegistrationServiceImpl extends ServiceImpl<PaymentRegistrationMapper, PaymentRegistration> implements IPaymentRegistrationService {
    @Autowired
    private PaymentRegistrationMapper paymentRegistrationMapper;

    @Autowired
    private PurchaseLedgerMapper purchaseLedgerMapper;

    @Autowired
    private InvoicePurchaseMapper invoicePurchaseMapper;

    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Autowired
    private SupplierManageMapper supplierManageMapper;

    @Autowired
    private SalesLedgerProductMapper salesLedgerProductMapper;

    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°
     *
     * @param id ä»˜æ¬¾ç™»è®°ä¸»é”®
     * @return ä»˜æ¬¾ç™»è®°
     */
    @Override
    public PaymentRegistration selectPaymentRegistrationById(Long id) {
        return paymentRegistrationMapper.selectPaymentRegistrationById(id);
    }

    /**
     * æŸ¥è¯¢ä»˜æ¬¾ç™»è®°åˆ—表
     *
     * @param paymentRegistrationDto ä»˜æ¬¾ç™»è®°
     * @return ä»˜æ¬¾ç™»è®°
     */
    @Override
    public List<PaymentRegistrationDto> selectPaymentRegistrationList(PaymentRegistrationDto paymentRegistrationDto) {
        List<PaymentRegistrationDto> list = paymentRegistrationMapper.selectPaymentRegistrationList(paymentRegistrationDto);
        for (PaymentRegistrationDto registrationDto : list) {
            List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new QueryWrapper<PaymentRegistration>()
                    .eq("invoice_purchase_id", registrationDto.getInvoicePurchaseId()));
            BigDecimal total = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            registrationDto.setUnPaymentAmount(registrationDto.getInvoiceAmount().subtract(total));
        }
        return list;
    }

    /**
     * æ–°å¢žä»˜æ¬¾ç™»è®°
     *
     * @param paymentRegistration ä»˜æ¬¾ç™»è®°
     * @return ç»“æžœ
     */
    @Override
    public int insertPaymentRegistration(PaymentRegistration paymentRegistration) {
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(paymentRegistration.getPurchaseLedgerId());
        SalesLedger salesLedger = salesLedgerMapper.selectOne(new QueryWrapper<SalesLedger>().
                eq("sales_contract_no", purchaseLedger.getSalesContractNo()));
        if (salesLedger == null) {
            throw new RuntimeException("关联销售合同号不存在");
        }

        paymentRegistration.setSaleLedgerId(salesLedger.getId());
        paymentRegistration.setSupplierId(purchaseLedger.getSupplierId());

        List<InvoicePurchase> invoicePurchases = invoicePurchaseMapper.selectList(new QueryWrapper<InvoicePurchase>().
                eq("purchase_contract_no", purchaseLedger.getPurchaseContractNumber()));
        if (invoicePurchases == null || invoicePurchases.size() == 0) {
            throw new RuntimeException("关联发票不存在");
        }
        paymentRegistration.setInvoicePurchaseId(invoicePurchases.get(0).getId());

        List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new QueryWrapper<PaymentRegistration>()
                .eq("invoice_purchase_id", invoicePurchases.get(0).getId()));
        BigDecimal total = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);

        if (total.add(paymentRegistration.getCurrentPaymentAmount()).compareTo(invoicePurchases.get(0).getInvoiceAmount()) > 0) {
            throw new RuntimeException("付款金额超出发票金额");
        }


        LoginUser loginUser = SecurityUtils.getLoginUser();
        Integer tenantId = loginUser.getTenantId();
        paymentRegistration.setTenantId(tenantId.longValue());
        paymentRegistration.setCreateTime(DateUtils.getNowDate());
        paymentRegistration.setUpdateTime(DateUtils.getNowDate());
        return paymentRegistrationMapper.insert(paymentRegistration);
    }

    /**
     * ä¿®æ”¹ä»˜æ¬¾ç™»è®°
     *
     * @param paymentRegistration ä»˜æ¬¾ç™»è®°
     * @return ç»“æžœ
     */
    @Override
    public int updatePaymentRegistration(PaymentRegistration paymentRegistration) {
        InvoicePurchase invoicePurchase = invoicePurchaseMapper.selectById(paymentRegistration.getInvoicePurchaseId());

        List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new QueryWrapper<PaymentRegistration>()
                .eq("invoice_purchase_id", paymentRegistration.getInvoicePurchaseId()).ne("id", paymentRegistration.getId()));
        BigDecimal total = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);

        if (total.add(paymentRegistration.getCurrentPaymentAmount()).compareTo(invoicePurchase.getInvoiceAmount()) > 0) {
            throw new RuntimeException("付款金额超出发票金额");
        }

        paymentRegistration.setUpdateTime(DateUtils.getNowDate());
        return paymentRegistrationMapper.updateById(paymentRegistration);
    }

    /**
     * æ‰¹é‡åˆ é™¤ä»˜æ¬¾ç™»è®°
     *
     * @param ids éœ€è¦åˆ é™¤çš„付款登记主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePaymentRegistrationByIds(Long[] ids) {
        return paymentRegistrationMapper.delete(new QueryWrapper<PaymentRegistration>().in("id", ids));
    }

    @Override
    public PaymentRegistration selectPaymentRegistrationByPurchaseId(Long id) {
        PaymentRegistrationDto paymentRegistrationDto = new PaymentRegistrationDto();
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
        paymentRegistrationDto.setSalesContractNo(purchaseLedger.getSalesContractNo());
        paymentRegistrationDto.setSupplierName(purchaseLedger.getSupplierName());
        paymentRegistrationDto.setSupplierId(purchaseLedger.getSupplierId());

        List<InvoicePurchase> invoicePurchaseList = invoicePurchaseMapper.selectList(new QueryWrapper<InvoicePurchase>()
                .eq("purchase_contract_no", purchaseLedger.getPurchaseContractNumber()));
        if (invoicePurchaseList != null && invoicePurchaseList.size() > 0) {
            paymentRegistrationDto.setInvoiceNumber(invoicePurchaseList.get(0).getInvoiceNumber());
            paymentRegistrationDto.setInvoiceAmount(invoicePurchaseList.get(0).getInvoiceAmount());
            paymentRegistrationDto.setTaxRate(invoicePurchaseList.get(0).getTaxRate());
        }
        return paymentRegistrationDto;
    }

    @Override
    public List<Map<String, Object>> selectPaymentLedgerList(PaymentLedgerDto paymentLedgerDto) {
        List<Map<String, Object>> result = new ArrayList<>();
        LambdaQueryWrapper<SupplierManage> queryWrapper = new LambdaQueryWrapper<>();
        Optional.ofNullable(paymentLedgerDto)
                .ifPresent(dto -> {
                    if (StringUtils.hasText(dto.getSupplierName())) {
                        queryWrapper.like(SupplierManage::getSupplierName, dto.getSupplierName());
                    }
                });

        List<SupplierManage> supplierManages = supplierManageMapper.selectList(queryWrapper);

        for (SupplierManage supplierManage : supplierManages) {
            Map<String, Object> res = new HashMap<>();
            res.put("supplierName", supplierManage.getSupplierName());

            // åº”付金额
            BigDecimal payableAmount = BigDecimal.ZERO;
            List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new QueryWrapper<SalesLedger>().eq("customer_id", supplierManage.getId()));
            if (salesLedgers != null && salesLedgers.size() > 0) {
                List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>()
                        .in("sales_ledger_id", salesLedgers.stream().map(SalesLedger::getId).collect(Collectors.toList())));
                // åº”付金额
                payableAmount = salesLedgerProducts.stream().map(SalesLedgerProduct::getTaxInclusiveTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add);

            }

            // å¼€ç¥¨é‡‘额
            BigDecimal invoiceAmount = salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);

            // ä»˜æ¬¾é‡‘额
            List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new QueryWrapper<PaymentRegistration>()
                    .eq("supplier_id", supplierManage.getId()));

            BigDecimal paymentAmount = BigDecimal.ZERO;
            if (paymentRegistrations != null && paymentRegistrations.size() > 0) {
                paymentAmount = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            }

            res.put("invoiceAmount", invoiceAmount);
            res.put("payableAmount", payableAmount);
            res.put("paymentAmount", paymentAmount);

            // è¯¦æƒ…
            List<Map<String, Object>> details = new ArrayList<>();
            for (PaymentRegistration paymentRegistration : paymentRegistrations) {
                Map<String, Object> detail = new HashMap<>();
                detail.put("voteCount", 1); // ç¥¨æ•°ï¼ŒæœªçŸ¥æ•°æ®æºï¼Œæš‚时用1
                detail.put("paymentAmount", paymentRegistration.getCurrentPaymentAmount()); // ä»˜æ¬¾é‡‘额
                InvoicePurchase  invoicePurchase = invoicePurchaseMapper.selectById(paymentRegistration.getInvoicePurchaseId());
                detail.put("payableAmount", invoicePurchase.getInvoiceAmount()); // åº”付金额
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                String formattedDate = sdf.format(paymentRegistration.getPaymentDate());
                detail.put("createTime", formattedDate); // å‘生时间
                details.add(detail);
            }

            res.put("details", paymentRegistrations);

            result.add(res);
        }

        return result;
    }
}

 src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java

@@ -121,4 +121,15 @@
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
    }

    /**
     * å®¢æˆ·é”€å”®è®°å½•
     * @param page
     * @param invoiceLedgerDto
     * @return
     */
    @GetMapping("/salesAccount")
    public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
    }

}

 src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java

@@ -4,6 +4,8 @@
import com.ruoyi.sales.pojo.InvoiceLedger;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@@ -25,4 +27,10 @@

    @ApiModelProperty(value = "发票文件名")
    private String invoiceFileName;

    @ApiModelProperty(value = "回款金额")
    private BigDecimal receiptPaymentAmount;

    @ApiModelProperty(value = "未回款金额")
    private BigDecimal unReceiptPaymentAmount;
}

 src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java

@@ -33,4 +33,12 @@
     */
    InvoiceLedgerDto invoiceLedgerInfo(Integer id);

    /**
     * å®¢æˆ·é”€å”®è®°å½•
     * @param page
     * @param invoiceLedgerDto
     * @return
     */
    IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);

}

 src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java

@@ -77,4 +77,12 @@
     * @return
     */
    List<InvoiceLedgerDto> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto);

    /**
     * å®¢æˆ·é”€å”®è®°å½•
     * @param page
     * @param invoiceLedgerDto
     * @return
     */
    IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);
}

 src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java

@@ -12,8 +12,10 @@
import com.ruoyi.sales.excel.InvoiceLedgerExcelDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.InvoiceLedgerService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -26,6 +28,7 @@

import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -42,6 +45,9 @@

    @Autowired
    private InvoiceLedgerFileMapper invoiceLedgerFileMapper;

    @Autowired
    private ReceiptPaymentMapper receiptPaymentMapper;

    /**
     * å¼€ç¥¨å°è´¦æ–°å¢ž
@@ -210,4 +216,30 @@
        return invoiceLedgerMapper.invoiceLedgerList(invoiceLedgerDto);
    }

    /**
     * å®¢æˆ·é”€å”®è®°å½•
     * @param page
     * @param invoiceLedgerDto
     * @return
     */
    @Override
    public IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
        IPage<InvoiceLedgerDto> invoiceLedgerDtoIPage = invoiceLedgerMapper.invoiceLedgerSalesAccount(page, invoiceLedgerDto);
        for (InvoiceLedgerDto record : invoiceLedgerDtoIPage.getRecords()) {
            QueryWrapper<ReceiptPayment> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("customer_id", record.getCustomerId());
            List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.selectList(queryWrapper);
            BigDecimal totalAmount = BigDecimal.ZERO;
            if(!CollectionUtils.isEmpty(receiptPaymentList)){
                for (ReceiptPayment receiptPayment : receiptPaymentList) {
                    totalAmount = totalAmount.add(receiptPayment.getInvoiceAmount());
                }
            }
            BigDecimal unReceiptPaymentAmount = record.getInvoiceAmount().subtract(totalAmount);
            record.setReceiptPaymentAmount(totalAmount);
            record.setUnReceiptPaymentAmount(unReceiptPaymentAmount);
        }
        return invoiceLedgerDtoIPage;
    }

}

 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.purchase.mapper.PaymentRegistrationMapper">

    <resultMap type="PaymentRegistration" id="PaymentRegistrationResult">
        <result property="id" column="id"/>
        <result property="saleLedgerId" column="sale_ledger_id"/>
        <result property="purchaseLedgerId" column="purchase_ledger_id"/>
        <result property="supplierId" column="supplier_id"/>
        <result property="invoicePurchaseId" column="invoice_purchase_id"/>
        <result property="currentPaymentAmount" column="current_payment_amount"/>
        <result property="paymentMethod" column="payment_method"/>
        <result property="registrantId" column="registrant_id"/>
        <result property="paymentDate" column="payment_date"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="tenantId" column="tenant_id"/>
    </resultMap>

    <resultMap type="com.ruoyi.purchase.dto.PaymentRegistrationDto" id="PaymentRegistrationDtoResult">
        <result property="id" column="id"/>
        <result property="saleLedgerId" column="sale_ledger_id"/>
        <result property="purchaseLedgerId" column="purchase_ledger_id"/>
        <result property="supplierId" column="supplier_id"/>
        <result property="invoicePurchaseId" column="invoice_purchase_id"/>
        <result property="currentPaymentAmount" column="current_payment_amount"/>
        <result property="paymentMethod" column="payment_method"/>
        <result property="registrantId" column="registrant_id"/>
        <result property="paymentDate" column="payment_date"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="salesContractNo" column="sales_contract_no"/>
        <result property="purchaseContractNumber" column="purchase_contract_number"/>
        <result property="supplierName" column="supplier_name"/>
        <result property="invoiceNumber" column="invoice_number"/>
        <result property="taxRate" column="tax_rate"/>
        <result property="invoiceAmount" column="invoice_amount"/>
        <result property="tenantId" column="tenant_id"/>
    </resultMap>

    <sql id="selectPaymentRegistrationVo">
        select pr.id,
               pr.sale_ledger_id,
               pr.purchase_ledger_id,
               pr.supplier_id,
               pr.invoice_purchase_id,
               pr.current_payment_amount,
               pr.payment_method,
               pr.registrant_id,
               pr.payment_date,
               pr.create_time,
               pr.update_time,
               pr.tenant_id,
               sl.sales_contract_no as sales_contract_no,
               pl.purchase_contract_number as purchase_contract_number,
               sm.supplier_name as supplier_name,
               ip.invoice_number as invoice_number,
               ip.tax_rate as tax_rate,
               ip.invoice_amount as invoice_amount
        from payment_registration pr
                 left join sales_ledger sl on pr.sale_ledger_id = sl.id
                 left join purchase_ledger pl on pr.purchase_ledger_id = pl.id
                 left join supplier_manage sm on pr.supplier_id = sm.id
                 left join invoice_purchase ip on pr.invoice_purchase_id = ip.id
                 left join sys_user su on pr.registrant_id = su.user_id
    </sql>

    <select id="selectPaymentRegistrationList" parameterType="com.ruoyi.purchase.dto.PaymentRegistrationDto"
            resultMap="PaymentRegistrationDtoResult">
        <include refid="selectPaymentRegistrationVo"/>
        <where>
            <if test="supplierNameOrContractNo != null  and supplierNameOrContractNo != ''">
                and sm.supplier_name LIKE CONCAT('%', #{supplierNameOrContractNo}, '%') or sl.sales_contract_no LIKE
                CONCAT('%', #{supplierNameOrContractNo}, '%')
                or pl.purchase_contract_number LIKE CONCAT('%', #{supplierNameOrContractNo}, '%')
            </if>
        </where>
    </select>

    <select id="selectPaymentRegistrationById" parameterType="Long" resultMap="PaymentRegistrationDtoResult">
        <include refid="selectPaymentRegistrationVo"/>
        where pr.id = #{id}
    </select>

</mapper>

 src/main/resources/mapper/sales/InvoiceLedgerMapper.xml

@@ -109,5 +109,18 @@
        WHERE T1.id = #{id}
    </select>

    <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
            customer_id,
            T2.customer_name,
            SUM( invoice_amount ) invoiceAmount
        FROM
            invoice_ledger T1
                LEFT JOIN customer T2 ON T1.customer_id = T2.id
        GROUP BY
            customer_id,
            T2.customer_name;
    </select>


</mapper>

 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml

@@ -33,7 +33,11 @@
                OR T1.sales_contract_no LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
                )
            </if>
            <if test="receiptPaymentDto.customerId != null">
                AND T1.customer_id = #{receiptPaymentDto.customerId}
            </if>
        </where>
        ORDER BY  T1.receipt_payment_date ASC
    </select>

    <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">