Skip to content

G
gic-spark-tag-4.0
Commit 58ac380f by guos
Options

会员标签4.0

parent 56c4d647
Showing with 8 additions and 7 deletions
src/main/java/com/gic/spark/filter/TagTopSingleConsumptionMoneyFilter.java
......@@ -54,7 +54,7 @@ public class TagTopSingleConsumptionMoneyFilter extends AbstractTagConsumRecord
result=true;
break;
case LATELY:
if(receiptsTime.getTime()>DateUtil.addNumForDay(new Date(),consumeAmountRequest.getTimeNum()).getTime()){
if(receiptsTime.getTime()>DateUtil.addNumForDay(new Date(),-consumeAmountRequest.getTimeNum()).getTime()){
result=true;
}
break;
......@@ -69,8 +69,7 @@ public class TagTopSingleConsumptionMoneyFilter extends AbstractTagConsumRecord
while (data.hasNext()){
Tuple2<Long, Iterable<TrdVirtualOrderBean>> tp2=data.next();
double topConsumAmount=0;
TrdVirtualOrderBean topConsumeAmountBean=null;
Double topConsumAmount=null;
Map<String,TrdVirtualOrderBean> effectiveOrderMap=new HashMap();
List<TrdVirtualOrderBean>noEffectiveOrderList=new ArrayList();
tp2._2().forEach(element->{
......@@ -88,11 +87,13 @@ public class TagTopSingleConsumptionMoneyFilter extends AbstractTagConsumRecord
}
});
for(TrdVirtualOrderBean amountBean:effectiveOrderMap.values()){
topConsumAmount=configStatus==1?
(topConsumeAmountBean.getPaid_amt()>topConsumAmount?topConsumeAmountBean.getPaid_amt():topConsumAmount):
(topConsumeAmountBean.getPay_amt()>topConsumAmount?topConsumeAmountBean.getPay_amt():topConsumAmount);
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;
switch (consumeAmountRequest.getNumberType()){
case between:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment