push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -44,6 +44,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.YearMonth;
@@ -1054,12 +1055,14 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
      * @param totalAmount
      * @param totalAmount
      * @return
      * @return
      */
      */
-    public void checkAmount(BigDecimal paidAmount,BigDecimal totalAmount) {
+    public void checkAmount(BigDecimal paidAmount, BigDecimal totalAmount) {
         paidAmount = ObjectUtils.defaultIfNull(paidAmount, BigDecimal.ZERO);
         paidAmount = ObjectUtils.defaultIfNull(paidAmount, BigDecimal.ZERO);
         totalAmount = ObjectUtils.defaultIfNull(totalAmount, BigDecimal.ZERO);
         totalAmount = ObjectUtils.defaultIfNull(totalAmount, BigDecimal.ZERO);
-        if (paidAmount.compareTo(totalAmount) != 0) {
-            //汇款明细合计总金额和实发总金额必须相等
-            throw new BusinessException("汇款明细合计总金额和实发总金额必须相等");
+        // 统一保留两位小数后比较
+        BigDecimal paidScaled = paidAmount.setScale(2, RoundingMode.HALF_UP);
+        BigDecimal totalScaled = totalAmount.setScale(2, RoundingMode.HALF_UP);
+        if (paidScaled.compareTo(totalScaled) != 0) {
+            throw new BusinessException("汇款明细合计总金额和实发总金额必须相等（精确到分）");
         }
         }
     }
     }