Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

昨天 b434660de4d072909c41c504aed6fd944ba53c86

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -64,12 +66,19 @@
            for (SalesLedgerProduct productDatum : productData) {
                // 如果开票数为0 跳过
                BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
                if(null != currentInvoiceNum && BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
                if(null == currentInvoiceNum || BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
                    continue;
                }
                invoiceAmountTotal = invoiceAmountTotal.add(currentInvoiceNum);
                InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
                BeanUtils.copyProperties(productDatum, invoiceRegistrationProduct);
                //更新已开票剩余未开票数
                invoiceRegistrationProductMapper.update(
                        null,
                        new LambdaUpdateWrapper<InvoiceRegistrationProduct>()
                                .eq(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerDto.getId())
                                .set(InvoiceRegistrationProduct::getNoInvoiceAmount, productDatum.getNoInvoiceAmount())
                );
                invoiceRegistrationProduct.setId(null);
                invoiceRegistrationProduct.setSalesLedgerId(salesLedgerDto.getId().intValue());
                invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistration.getId());
@@ -78,6 +87,8 @@
                invoiceRegistrationProduct.setSalesLedgerProductId(productDatum.getId().intValue());

                invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
                productDatum.setInvoiceNum(currentInvoiceNum);
                productDatum.setInvoiceAmount(productDatum.getCurrentInvoiceAmount());
                salesLedgerProductMapper.updateById(productDatum);
                // 新增一条开票台账数据
                InvoiceLedger invoiceLedger = new InvoiceLedger();
@@ -86,6 +97,7 @@
                invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
                invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
                invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
                invoiceLedger.setInvoicePerson(productDatum.getRegister());

                invoiceLedgerMapper.insert(invoiceLedger);
            }