会员标签4.0

src/main/java/com/gic/spark/filter/AbstractTagConsumRecordFilter.java

@@ -28,23 +28,25 @@ public abstract class AbstractTagConsumRecordFilter implements BaseTagFilter {
             List<TrdVirtualOrderBean> result=new ArrayList();
             while (data.hasNext()){
                 TrdVirtualOrderBean consumeRecordBean=data.next();
-                switch (request.getStatisticsType()){
-                    case COMMODITYBRAND:
-                        if(request.getStatisticsValList().contains(consumeRecordBean.getEnt_id())){
-                            result.add(consumeRecordBean);
-                        }
-                        break;
-                    case CHANNEL:
-                        if(request.getStatisticsValList().contains(consumeRecordBean.getOrder_channel_code())){
-                            result.add(consumeRecordBean);
-                        }
-                        break;
-                    case MCUINFO:
-                        if(request.getStatisticsValList().contains(consumeRecordBean.getArea_id())){
-                            result.add(consumeRecordBean);
-                        }
-                        break;
-                    default:break;
+                if(null!=request&&null!=request.getStatisticsType()){
+                    switch (request.getStatisticsType()){
+                        case COMMODITYBRAND:
+                            if(request.getStatisticsValList().contains(consumeRecordBean.getEnt_id())){
+                                result.add(consumeRecordBean);
+                            }
+                            break;
+                        case CHANNEL:
+                            if(request.getStatisticsValList().contains(consumeRecordBean.getOrder_channel_code())){
+                                result.add(consumeRecordBean);
+                            }
+                            break;
+                        case MCUINFO:
+                            if(request.getStatisticsValList().contains(consumeRecordBean.getArea_id())){
+                                result.add(consumeRecordBean);
+                            }
+                            break;
+                        default:break;
+                    }
                 }
             }
             return result.iterator();

src/main/java/com/gic/spark/tag/TagValueParser.java

@@ -172,7 +172,7 @@ public class TagValueParser {
             if (Pattern.compile("flag").matcher(conditionValDTO.getKey()).find()) {
                 setStatisticsTypeHandle(request, conditionValDTO.getKey(), conditionValDTO.getVal());
             }else if(conditionValDTO.getKey().equals(TagValKeyEnum.COMPONENT_COMMODITY.getKey())){
-                List<String>skuCodeList=null;//需要调用接口
+                List<String>skuCodeList=new ArrayList();//需要调用接口
                 request.setSkuCodeList(skuCodeList);
             }else if(Pattern.compile("timeRange").matcher(conditionValDTO.getKey()).find()){
                 String[] keys=conditionValDTO.getKey().split("\\.");