浏览代码

修改bug

rainwer 6 月之前
父节点
当前提交
6fca9ca170

+ 11 - 1
src/main/java/cn/ezhizao/project/business/collection/service/impl/BizCollectionServiceImpl.java

@@ -347,7 +347,17 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
                 if (i == contractDetails.size() - 1) {
                     detail.setArriveAmount(item.getAmount().subtract(remain));
                 } else {
-                    detail.setArriveAmount(item.getAmount().divide(detailSum, 4, RoundingMode.HALF_UP).multiply(l.getAmount()).setScale(2, RoundingMode.HALF_UP));
+                    if(item.getAmount().equals(BigDecimal.ZERO) || detailSum.equals(BigDecimal.ZERO)) {
+                        detail.setArriveAmount(BigDecimal.ZERO);
+                    } else {
+                        detail.setArriveAmount(item.getAmount().divide(detailSum, 4, RoundingMode.HALF_UP).multiply(l.getAmount()).setScale(2, RoundingMode.HALF_UP));
+                    }
+//                    try {
+//                        detail.setArriveAmount(item.getAmount().divide(detailSum, 4, RoundingMode.HALF_UP).multiply(l.getAmount()).setScale(2, RoundingMode.HALF_UP));
+//                    } catch (ArithmeticException e) {
+//                        log.error(item.toString());
+//                    }
+
                     remain = remain.add(detail.getArriveAmount());
                 }
                 details.add(detail);