Merge branch 'pre' into 'master'

isRefundPoundage

See merge request !61

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

@@ -699,7 +699,7 @@ public class DataUtils {
     // 获取手续费
     public ArrayList<OrderRefundPoundage> getRefundPoundage(Integer isRefundPoundage) {
         ArrayList<OrderRefundPoundage> orderRefundPoundageArrayList = ObjectUtil.getOrderRefundPoundageArrayList();
-        if (isRefundPoundage > 0) { // 开启了演出退票有手续费
+        if (null != isRefundPoundage && isRefundPoundage > 0) { // 开启了演出退票有手续费
             Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE);
             if (obj == null) {
                 OrderRefundPoundage vo1 = OrderRefundPoundage.getNew();