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

@@ -156,7 +156,10 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-
+        Map<String,Object> map=new HashMap<String, Object>();
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.setUserOpenId(openid);
+        /**********判断useType=1 为收入记录**************/
         if(useType != null && useType==1){
             Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
             if(gainIntegralCount != null && gainIntegralCount<0){
@@ -165,16 +168,13 @@ public class UseIntegralHandler {
                 rm.setMessage(NameUtils.getConfig("ERRORINFO"));
                 return rm;
             }
-            UseIntegral useIntegral=new UseIntegral();
-            useIntegral.setUserOpenId(openid);
-            useIntegral.setIntegralType(useType);
+
             useIntegral.getPage().setPageSize(pageSize);
             useIntegral.getPage().setPageNumber(pageNO);
             useIntegral.getPage().initRecordBegin();
             useIntegral.setIntegralType(useType);
             List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
-            Map<String,Object> map=new HashMap<String, Object>();
             map.put("listIntegralInfo",listIntegralInfo);
             map.put("gainIntegralCount",gainIntegralCount);
 
@@ -184,6 +184,7 @@ public class UseIntegralHandler {
             rm.setData(map);
             return rm;
         }
+        /**********判断useType=3 为待入账记录**************/
         if(useType != null && useType==3){
             Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
             if(stayIntegralCount != null && stayIntegralCount<0){
@@ -192,15 +193,13 @@ public class UseIntegralHandler {
                 rm.setMessage(NameUtils.getConfig("ERRORINFO"));
                 return rm;
             }
-            UseIntegral useIntegral=new UseIntegral();
-            useIntegral.setUserOpenId(openid);
-            useIntegral.setIntegralType(useType);
+
             useIntegral.getPage().setPageSize(pageSize);
             useIntegral.getPage().setPageNumber(pageNO);
             useIntegral.getPage().initRecordBegin();
             useIntegral.setIntegralType(useType);
             List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
-            Map<String,Object> map=new HashMap<String, Object>();
+
             map.put("listIntegralInfo",listIntegralInfo);
             map.put("stayIntegralCount",stayIntegralCount);
 
@@ -210,21 +209,37 @@ public class UseIntegralHandler {
             rm.setData(map);
             return rm;
         }
+
+        /**********否则 为全部记录**************/
         Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
         Integer useIntegralCount=useIntegralService.getUseIntegralCount(openid);
         Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
 
+        if(gainIntegralCount != null && gainIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        if(stayIntegralCount != null && stayIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        if(useIntegralCount != null && useIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
 
-        UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(openid);
-        useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
         useIntegral.setIntegralType(null);
         List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
-        Map<String,Object> map=new HashMap<String, Object>();
         map.put("listIntegralInfo",listIntegralInfo);
         map.put("useIntegralCount",useIntegralCount);
         map.put("gainIntegralCount",gainIntegralCount);
@@ -255,11 +270,17 @@ public class UseIntegralHandler {
         }
         /*************会员等级***************/
         Member memberInfo=memberService.getMyMemberInfo(openid);
-        int userIntegralCount=memberInfo.getUserIntegral();
+        Integer userIntegralCount=memberInfo.getUserIntegral();
+        if(userIntegralCount != null && userIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
         List<RankRule> list=useIntegralService.getRankRule();
         List<RankRule> lists=new ArrayList<RankRule>();
         for(RankRule r:list){
-            if(r.getRankRuleIntegral()>=userIntegralCount){
+            if(r.getRankRuleIntegral()>userIntegralCount){
                 lists.add(r);
             }
         }