소스 검색

add export bill

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

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

@@ -838,7 +838,7 @@ public class ExportController extends BaseController {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
             String feeBase = "0.28";
-            if(row.getPaymentBusinessChannel().equals("alipay_wap")){
+            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);
@@ -1902,7 +1902,7 @@ public class ExportController extends BaseController {
                 row.setBalancePaymentAmount(BigDecimal.ZERO);
             }
             String feeBase = "0.28";
-            if(row.getPaymentBusinessChannel().equals("alipay_wap")){
+            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);