gongdecai il y a 1 an
Parent
commit
f149b46780

+ 4 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -527,7 +527,10 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                         distributionMoney = expenseAllocationInfoList1.stream().mapToDouble(ExpenseAllocationInfo::getDistributionMoney).sum();
                     }
                     WarehousingOrder warehousingOrder = warehousingOrderService.selectById(expenseAllocationInfoList.get(i).getOrderId());
-                    distributionMoney=distributionMoney+warehousingOrder.getInterest()+warehousingOrder.getStorageFee();
+                    if(warehousingOrder != null){
+
+                        distributionMoney=distributionMoney+warehousingOrder.getInterest()+warehousingOrder.getStorageFee();
+                    }
                     if ((distributionMoney + expenseAllocationInfoList.get(i).getDistributionMoney()) / warehousingOrder.getInWarehouseWeight() > 100) {
                         serialNo = serialNo + (i + 1) + '、';
                     }