积分商城

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -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;
-//        List<RankRule> lists=new ArrayList<RankRule>();
-        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);
-
-        /*获取个人能用的优惠券数量*/
-//        CouponItem couponItem = new CouponItem();
-//        couponItem.setCouponItemCurrentUserOpenid(member.getUserOpenid());
-//        couponItem.setCouponUseStatus(1);   //coupon_use_status
-//        Integer availableCoupons = couponItemService.userCouponNum(couponItem);
+        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);