|
@@ -323,40 +323,16 @@ public class UseIntegralHandler {
|
|
|
rm.setData("");
|
|
|
return rm;
|
|
|
}
|
|
|
-
|
|
|
- Integer rr = memberService.getUserGrad(member.getUserId());
|
|
|
- RankRule rankr = useIntegralService.getRankRuleById(rr);
|
|
|
-
|
|
|
- Integer distanceNextLevelIntegral = -1;
|
|
|
-
|
|
|
- RankRule rankRule = null;
|
|
|
- for(int i =0 ;i<list.size();i++){
|
|
|
- RankRule r = list.get(i);
|
|
|
- if(r.getRankRuleIntegral() > userIntegralCount){
|
|
|
- if(rankRule == null){
|
|
|
- rankRule = r;
|
|
|
- }else if(rankRule != null && rankRule.getRankRuleIntegral()!=null && rankRule.getRankRuleIntegral() > r.getRankRuleIntegral()){
|
|
|
- rankRule = r;
|
|
|
- }
|
|
|
+ List<RankRule> lists=new ArrayList<RankRule>();
|
|
|
+ for(RankRule r:list){
|
|
|
+ if(r.getRankRuleIntegral()>userIntegralCount){
|
|
|
+ lists.add(r);
|
|
|
}
|
|
|
}
|
|
|
- if(rankRule == null){
|
|
|
- distanceNextLevelIntegral = -1;
|
|
|
- }else{
|
|
|
- distanceNextLevelIntegral = rankRule.getRankRuleIntegral() - userIntegralCount;
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
- Integer notSendCount= adminOrderService.getNotSendCount(openid);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ Integer notSendCount=adminOrderService.getNotSendCount(openid);
|
|
|
|
|
|
- map.put("currentRankRule",rankr);
|
|
|
- map.put("distanceNextLevelIntegral",distanceNextLevelIntegral);
|
|
|
+ map.put("listRankRule",lists);
|
|
|
map.put("notSendCount",notSendCount);
|
|
|
map.put("memberInfo",memberInfo);
|
|
|
rm.setStatus(true);
|