Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html

@@ -179,7 +179,7 @@
             isRefundPoundage: parseInt($("input[name^='performance_isRefundPoundage']:checked").val()),
             isRefundVoucher: parseInt($("input[name^='performance_isRefundVoucher']:checked").val()),
             isRefundExpress: parseInt($("input[name^='performance_isRefundExpress']:checked").val()),
-            isBackPaperTicket: parseInt($("input[name^='isBackPaperTicket']:checked").val())
+            isBackPaperTicket: parseInt($("input[name^='isBackPaperTicket']:checked").val()),
             isRefundExpressNew: parseInt($("input[name^='isRefundExpressNew']:checked").val())
         }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java

@@ -129,7 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
-            if (performanceVo.getIsRefundExpressNew() == 1) {
+            if (null != performanceVo.getIsRefundExpressNew() && performanceVo.getIsRefundExpressNew() == 1) {
                 Integer refundNum = 0;
                 BigDecimal priceExpressOld = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
@@ -238,7 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal priceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
-            if (performanceVo.getIsRefundExpressNew() == 1) {
+            if (null != performanceVo.getIsRefundExpressNew() && performanceVo.getIsRefundExpressNew() == 1) {
                 Integer refundNum = 0;
                 BigDecimal priceExpressOld = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {