Merge remote-tracking branch 'origin/master'

zss

昨天 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

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

@@ -64,7 +64,10 @@
            for (SalesLedgerProduct productDatum : productData) {
                // 如果开票数为0 跳过
                BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
                if(null != currentInvoiceNum && BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
                if (null == currentInvoiceNum) {
                    continue;
                }
                if(BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
                    continue;
                }
                invoiceAmountTotal = invoiceAmountTotal.add(currentInvoiceNum);
@@ -86,6 +89,7 @@
                invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
                invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
                invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
                invoiceLedger.setInvoicePerson(productDatum.getRegister());

                invoiceLedgerMapper.insert(invoiceLedger);
            }