|
@@ -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) + '、';
|
|
|
}
|