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

@@ -176,7 +176,7 @@ public class UseIntegralHandler {
 
             Map<String,Object> map=new HashMap<String, Object>();
             map.put("listIntegralInfo",listIntegralInfo);
-            map.put("stayIntegralCount",gainIntegralCount);
+            map.put("gainIntegralCount",gainIntegralCount);
 
             rm.setStatus(true);
             rm.setResultCode(ResultInfo.SUCCESSCODE);
@@ -184,7 +184,7 @@ public class UseIntegralHandler {
             rm.setData(map);
             return rm;
         }
-        if(useType != null && useType==2){
+        if(useType != null && useType==3){
             Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
             if(stayIntegralCount != null && stayIntegralCount<0){
                 rm.setStatus(false);