Browse Source

add export bill

周箭河 5 years ago
parent
commit
536e7fb219

+ 2 - 10
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -837,11 +837,7 @@ public class ExportController extends BaseController {
             if (row.getBalancePaymentAmount() == null) {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
-            String feeBase = "0.28";
-            if(row.getPaymentBusinessChannel()!= null && row.getPaymentBusinessChannel().equals("alipay_wap")){
-                feeBase = "0.68";
-            }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal(feeBase)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;
@@ -1901,11 +1897,7 @@ public class ExportController extends BaseController {
             if (row.getBalancePaymentAmount() == null) {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
-            String feeBase = "0.28";
-            if(row.getPaymentBusinessChannel()!= null && row.getPaymentBusinessChannel().equals("alipay_wap")){
-                feeBase = "0.68";
-            }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal(feeBase)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;