|
@@ -269,10 +269,16 @@ public class UseIntegralHandler {
|
|
rm.setMessage(ResultInfo.loginOutError);
|
|
rm.setMessage(ResultInfo.loginOutError);
|
|
return rm;
|
|
return rm;
|
|
}
|
|
}
|
|
|
|
+
|
|
/*************会员等级***************/
|
|
/*************会员等级***************/
|
|
Member memberInfo=memberService.getMyMemberInfo(openid);
|
|
Member memberInfo=memberService.getMyMemberInfo(openid);
|
|
-// HttpSession session=req.getSession();
|
|
|
|
-// session.setAttribute("memberInfo",memberInfo);
|
|
|
|
|
|
+ if(memberInfo==null){
|
|
|
|
+ rm.setStatus(false);
|
|
|
|
+ rm.setResultCode(ResultInfo.ERRORCODE);
|
|
|
|
+ rm.setMessage(NameUtils.getConfig("ERRORINFO"));
|
|
|
|
+ rm.setData("");
|
|
|
|
+ return rm;
|
|
|
|
+ }
|
|
Integer userIntegralCount=memberInfo.getUserIntegral();
|
|
Integer userIntegralCount=memberInfo.getUserIntegral();
|
|
if(userIntegralCount != null && userIntegralCount<0){
|
|
if(userIntegralCount != null && userIntegralCount<0){
|
|
rm.setStatus(false);
|
|
rm.setStatus(false);
|
|
@@ -281,6 +287,13 @@ public class UseIntegralHandler {
|
|
return rm;
|
|
return rm;
|
|
}
|
|
}
|
|
List<RankRule> list=useIntegralService.getRankRule();
|
|
List<RankRule> list=useIntegralService.getRankRule();
|
|
|
|
+ if((list!=null&&list.size()<0)||list==null){
|
|
|
|
+ rm.setStatus(false);
|
|
|
|
+ rm.setResultCode(ResultInfo.ERRORCODE);
|
|
|
|
+ rm.setMessage(NameUtils.getConfig("ERRORINFO"));
|
|
|
|
+ rm.setData("");
|
|
|
|
+ return rm;
|
|
|
|
+ }
|
|
List<RankRule> lists=new ArrayList<RankRule>();
|
|
List<RankRule> lists=new ArrayList<RankRule>();
|
|
for(RankRule r:list){
|
|
for(RankRule r:list){
|
|
if(r.getRankRuleIntegral()>userIntegralCount){
|
|
if(r.getRankRuleIntegral()>userIntegralCount){
|