Bläddra i källkod

Merge remote-tracking branch 'origin/master'

wanghao 3 månader sedan
förälder
incheckning
af1848bdbd

+ 4 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -761,7 +761,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
         // 私有手续费 应收金额
         // 交强的总手续费(jq_commission_premium) + 商业的总手续费(sy_commission_premium)
-        return switch (invoiceType) {
+        BigDecimal result = switch (invoiceType) {
             case "1" -> jqCommissionPremium.add(syCommissionPremium);
             case "2" ->
                 // 交强的总跟单费(jq_follow_premium) + 商业的总跟单费(sy_follow_premium)
@@ -780,6 +780,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     jyCommissionPremium.add(jyFollowPremium);
             default -> null;
         };
+        // 四舍五入
+        return result.setScale(2, BigDecimal.ROUND_HALF_UP);
     }
 
     /**
@@ -1144,6 +1146,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         }
 
         // 处理数据
+
         for (ReceivableExportExcelVo vo : receivableExportExcelVos) {
             // 1. 空数据校验
             ImportResultVo resultVo = vo.checkEmpty();