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

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/memberMapper.xml

@@ -42,7 +42,7 @@
 	<!-- 获取个人信息-->
 	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
 		SELECT
-			user_head,user_nickname,user_sex,user_name,user_birth_date,user_tel,user_age_stage,user_identity
+			user_head,user_nickname,user_sex,user_name,user_birth_date,user_tel,user_age_stage,user_identity,
 			user_integral,user_stay_integral,user_use_integral,user_surplus_integral
 		FROM TB_IAMBERRY_USER_USERINFO
 		WHERE user_openid = #{userOpenid}

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);