Merge remote-tracking branch 'origin/master'

yaowanxin

21 小时以前 e2aa651db9f17d58819329de571037edc0f9eba2

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

@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.pojo.ReceiptPayment;
import org.apache.ibatis.annotations.Param;

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

public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {

@@ -22,7 +26,7 @@
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto);

    /**
     * 开票台账详情
@@ -39,4 +43,38 @@
     */
    BigDecimal getReceiptAmount(@Param("customerId") Integer customerId, @Param("total") long total);

    /**
     * 查询回款记录
     */
    List<ReceiptPaymentDto> receiptPaymentHistoryList(@Param("params") ReceiptPaymentDto receiptPaymentDto);

    /**
     * 查询回款记录分页
     */
    IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page,@Param("params") ReceiptPaymentDto receiptPaymentDto);

    /**
     * 客户往来记录查询
     * @param receiptPaymentDto
     * @return
     */
    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);

    /**
     * 查询回款记录不分页
     */
    List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto);

    /**
     * 通过开票登记产品id查询是否已经有回款记录
     * @param invoiceRegistrationProductId
     * @return
     */
    List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId);

    List<ReceiptPaymentDto> bindInvoiceNoRegListAll();

    List<ReceiptPaymentExeclDto> bindInvoiceNoRegListByIds(List<Long> ids,Long tenantId);


}