|
@@ -160,7 +160,7 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
|
|
|
BigDecimal collectedAmount = BigDecimal.valueOf(collected.stream().mapToDouble(v -> v.getArriveAmount().doubleValue()).sum());
|
|
|
if(null == item.getAmount() || null == archiveInput.getTrueAmount() ||item.getAmount().subtract(archiveInput.getTrueAmount().subtract(collectedAmount)).compareTo(BigDecimal.ZERO) >0){
|
|
|
failureNum++;
|
|
|
- failureMsg.append("<br/>").append(failureNum).append("、订单 ").append(item.getContractNo()).append("系统内存在收款或收款金额不能大于未收款金额");
|
|
|
+ failureMsg.append("<br/>").append(failureNum).append("、订单 ").append(item.getContractNo()).append("现系统内收款加上excel表内收款金额已超出合同收款总金额");
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -345,7 +345,7 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
|
|
|
|
|
|
if(null == item.getAmount() || null == archiveInput.getTrueAmount() ||item.getAmount().subtract(archiveInput.getTrueAmount().subtract(collectedAmount)).compareTo(BigDecimal.ZERO) >0){
|
|
|
failureNum++;
|
|
|
- failureMsg.append("<br/>").append(failureNum).append("、订单 ").append(item.getContractNo()).append("系统内存在收款或收款金额不能大于未收款金额");
|
|
|
+ failureMsg.append("<br/>").append(failureNum).append("、订单 ").append(item.getContractNo()).append("现系统内收款加上excel表内收款金额已超出合同收款总金额");
|
|
|
continue;
|
|
|
}
|
|
|
|