Ver Fonte

bug:108 - 【发票管理】-新数据字段sumInvoiceMoney为null

24282 há 2 anos atrás
pai
commit
6cbf1d7f1a

+ 1 - 1
hx-purchase/src/main/java/com/fjhx/purchase/service/invoice/impl/InvoiceServiceImpl.java

@@ -97,7 +97,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         Map<Long, BigDecimal> invoiceMap = invoiceDetailsList.stream().collect(Collectors.toMap(InvoiceDetailsVo::getPurchaseId,InvoiceDetailsVo::getSumMoney));
         for(InvoiceDetailsVo p:invoiceDetailsVos){
             if(MapUtils.isNotEmpty(invoiceMap)){
-                p.setSumMoney(invoiceMap.getOrDefault(p.getPurchaseId(),null));
+                p.setSumMoney(invoiceMap.getOrDefault(p.getPurchaseId(), BigDecimal.ZERO));
             }else{
                 p.setSumMoney(BigDecimal.ZERO);
             }

+ 2 - 2
hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -392,12 +392,12 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         Map<Long, BigDecimal> payMap = payDetailVoList.stream().collect(Collectors.toMap(PayDetailVo::getPurchaseId, PayDetailVo::getSumMoney));
         for (Purchase p : list) {
             if (MapUtils.isNotEmpty(invoiceMap)) {
-                p.setSumInvoiceMoney(invoiceMap.getOrDefault(p.getId(), null));
+                p.setSumInvoiceMoney(invoiceMap.getOrDefault(p.getId(), BigDecimal.ZERO));
             } else {
                 p.setSumInvoiceMoney(BigDecimal.ZERO);
             }
             if (MapUtils.isNotEmpty(payMap)) {
-                p.setSumPayMoney(payMap.getOrDefault(p.getId(), null));
+                p.setSumPayMoney(payMap.getOrDefault(p.getId(), BigDecimal.ZERO));
             } else {
                 p.setSumPayMoney(BigDecimal.ZERO);
             }