浏览代码

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);