소스 검색

add export bill

周箭河 5 년 전
부모
커밋
b5efb1a5d6
1개의 변경된 파일10개의 추가작업 그리고 2개의 파일을 삭제
  1. 10 2
      mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

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

@@ -830,7 +830,11 @@ public class ExportController extends BaseController {
             if (row.getBalancePaymentAmount() == null) {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            String feeBase = "0.28";
+            if(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);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;
@@ -1890,7 +1894,11 @@ public class ExportController extends BaseController {
             if (row.getBalancePaymentAmount() == null) {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            String feeBase = "0.28";
+            if(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);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;