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,27 +156,65 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        Integer useIntegralCount=useIntegralService.getUseIntegralCount(openid);
-        Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
-        Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
-        if(useIntegralCount != null && useIntegralCount<0){
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-            return rm;
-        }
-        if(gainIntegralCount != null && gainIntegralCount<0){
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+
+        if(useType != null && useType==1){
+            Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
+            if(gainIntegralCount != null && gainIntegralCount<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(useType);
+            List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
+
+            Map<String,Object> map=new HashMap<String, Object>();
+            map.put("listIntegralInfo",listIntegralInfo);
+            map.put("stayIntegralCount",gainIntegralCount);
+
+            rm.setStatus(true);
+            rm.setResultCode(ResultInfo.SUCCESSCODE);
+            rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+            rm.setData(map);
             return rm;
         }
-        if(stayIntegralCount != null && stayIntegralCount<0){
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+        if(useType != null && useType==2){
+            Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
+            if(stayIntegralCount != null && stayIntegralCount<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(useType);
+            List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
+            Map<String,Object> map=new HashMap<String, Object>();
+            map.put("listIntegralInfo",listIntegralInfo);
+            map.put("stayIntegralCount",stayIntegralCount);
+
+            rm.setStatus(true);
+            rm.setResultCode(ResultInfo.SUCCESSCODE);
+            rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+            rm.setData(map);
             return rm;
         }
+        Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
+        Integer useIntegralCount=useIntegralService.getUseIntegralCount(openid);
+        Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
+
+
         UseIntegral useIntegral=new UseIntegral();
         useIntegral.setUserOpenId(openid);
         useIntegral.setIntegralType(useType);
@@ -184,10 +222,10 @@ public class UseIntegralHandler {
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
         useIntegral.setIntegralType(null);
-        List<UseIntegral> listAllIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
+        List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
         Map<String,Object> map=new HashMap<String, Object>();
-        map.put("listAllIntegralInfo",listAllIntegralInfo);
+        map.put("listIntegralInfo",listIntegralInfo);
         map.put("useIntegralCount",useIntegralCount);
         map.put("gainIntegralCount",gainIntegralCount);
         map.put("stayIntegralCount",stayIntegralCount);