会员标签4.0

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

@@ -71,7 +71,7 @@ public class TagLowestSingleConsumptionMoneyFilter extends AbstractTagConsumReco
                                     while (data.hasNext()){
 
                                         Tuple2<Long, Iterable<TrdVirtualOrderBean>> tp2=data.next();
-                                        double topConsumAmount=0;
+                                        Double topConsumAmount=null;
                                         Map<String,TrdVirtualOrderBean> effectiveOrderMap=new HashMap();
                                         List<TrdVirtualOrderBean>noEffectiveOrderList=new ArrayList();
                                         tp2._2().forEach(element->{
@@ -88,13 +88,21 @@ public class TagLowestSingleConsumptionMoneyFilter extends AbstractTagConsumReco
                                                 effectiveOrder.setPay_amt(effectiveOrder.getPay_amt()+noEffectiveOrder.getPay_amt());
                                             }
                                         });
+
                                         for(TrdVirtualOrderBean amountBean:effectiveOrderMap.values()){
-                                            topConsumAmount=configStatus==1?
-                                                    (CommonUtil.isEmptyDouble2double(amountBean.getPaid_amt())<topConsumAmount?CommonUtil.isEmptyDouble2double(amountBean.getPaid_amt()):topConsumAmount):
-                                                    (CommonUtil.isEmptyDouble2double(amountBean.getPay_amt())<topConsumAmount?CommonUtil.isEmptyDouble2double(amountBean.getPay_amt()):topConsumAmount);
-                                        }
+                                            System.out.println("configStatus==>"+configStatus+"paid_amt==>"+amountBean.getPaid_amt()+"pay_amt==>"+amountBean.getPay_amt());
 
+                                            if(1==configStatus){
+                                                topConsumAmount=null==topConsumAmount?amountBean.getPaid_amt():(amountBean.getPaid_amt()<topConsumAmount?amountBean.getPaid_amt():topConsumAmount);
+                                            }else{
+                                                topConsumAmount=null==topConsumAmount?amountBean.getPay_amt():(amountBean.getPay_amt()<topConsumAmount?amountBean.getPay_amt():topConsumAmount);
+                                            }
+
+
+                                        }
+                                        topConsumAmount=null==topConsumAmount?0:topConsumAmount;
 
+                                        System.out.println("topConsumAmount==>"+topConsumAmount);
                                         switch (consumeAmountRequest.getNumberType()){
                                             case between:
                                                 if(topConsumAmount>=consumeAmountRequest.getBeginNum()