Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

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

@@ -219,18 +219,18 @@ public class UseIntegralHandler {
         Member memberInfo=memberService.getMyMemberInfo(openid);
         int userIntegralCount=memberInfo.getUserIntegral();
         List<RankRule> list=useIntegralService.getRankRule();
-        RankRule rankRule=null;
+        List<RankRule> lists=new ArrayList<RankRule>();
         for(RankRule r:list){
             if(r.getRankRuleIntegral()>=userIntegralCount){
-                rankRule=r;
-                break;
+                lists.add(r);
             }
         }
         /**************未发货数量*****************/
         Integer notSendCount=adminOrderService.getNotSendCount(openid);
 
+        map.put("lists",lists);
         map.put("notSendCount",notSendCount);
-        map.put("rankRule",rankRule);
+        map.put("rankRule",lists.get(0));
         map.put("member",memberInfo);
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);