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-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -22,21 +22,21 @@ public interface UseIntegralService {
      * @param userOpenId
      * @return
      */
-    int getGainIntegralCount(String userOpenId);
+    Integer getGainIntegralCount(String userOpenId);
 
     /**
      * 使用的总积分数
      * @param openid
      * @return
      */
-    int getUseIntegralCount(String openid);
+    Integer getUseIntegralCount(String openid);
 
     /**
      * 待入账的总积分数
      * @param userOpenId
      * @return
      */
-    int getStayIntegralCount(String userOpenId);
+    Integer getStayIntegralCount(String userOpenId);
 
     /**
      * 查询积分来源信息

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -35,7 +35,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      * @return
      */
     @Override
-    public int getGainIntegralCount(String userOpenId) {
+    public Integer getGainIntegralCount(String userOpenId) {
         return useIntegralMapper.getGainIntegralCount(userOpenId);
     }
 
@@ -45,7 +45,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      * @return
      */
     @Override
-    public int getUseIntegralCount(String openid) {
+    public Integer getUseIntegralCount(String openid) {
         return useIntegralMapper.getUseIntegralCount(openid);
     }
 
@@ -55,7 +55,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      * @return
      */
     @Override
-    public int getStayIntegralCount(String userOpenId) {
+    public Integer getStayIntegralCount(String userOpenId) {
         return useIntegralMapper.getStayIntegralCount(userOpenId);
     }
 

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

@@ -22,21 +22,21 @@ public interface UseIntegralMapper {
      * @param userOpenId
      * @return
      */
-    int getGainIntegralCount(String userOpenId);
+    Integer getGainIntegralCount(String userOpenId);
 
     /**
      * 使用的总积分数
      * @param openid
      * @return
      */
-    int getUseIntegralCount(String openid);
+    Integer getUseIntegralCount(String openid);
 
     /**
      * 待入账的总积分数
      * @param userOpenId
      * @return
      */
-    int getStayIntegralCount(String userOpenId);
+    Integer getStayIntegralCount(String userOpenId);
 
     /**
      * 查询积分来源信息

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

@@ -7,7 +7,6 @@
         user_openid userOpenId,
         integral_type integralType,
         integral_number integralNumber,
-        integral_type useType,
         config_id configId,
         integral_remarks integralRemarks,
         integral_create_time integralCreateTime,
@@ -23,8 +22,8 @@
           tb_iamberry_use_integral i
         LEFT JOIN tb_iamberry_integral_config c ON i.config_id = c.integral_config_id
         WHERE i.user_openid=#{userOpenId}
-            <if test="useType != null||useType != ''">
-               AND i.integral_type = #{useType}
+            <if test="integralType != null||integralType != ''">
+               AND i.integral_type = #{integralType}
             </if>
         ORDER BY i.integral_id DESC
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
@@ -36,19 +35,19 @@
     </select>
 
     <!--获得的总积分数-->
-    <select id="getGainIntegralCount" parameterType="String" resultType="int">
+    <select id="getGainIntegralCount" parameterType="String" resultType="Integer">
         SELECT avg(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=1
     </select>
     <!--使用的总积分数-->
-    <select id="getUseIntegralCount" parameterType="String" resultType="int">
+    <select id="getUseIntegralCount" parameterType="String" resultType="Integer">
         SELECT avg(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=2
     </select>
     <!--待入账的总积分数-->
-    <select id="getStayIntegralCount" parameterType="String" resultType="int">
+    <select id="getStayIntegralCount" parameterType="String" resultType="Integer">
         SELECT avg(stay_number)
         FROM tb_iamberry_stay_integral
         WHERE user_openid=#{userOpenid} AND stay_status=1

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -57,13 +57,13 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        int gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
-        if(gainIntegralCount<0){
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-            return rm;
-        }
+        Integer gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
+            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(m.getUserOpenid());
         useIntegral.setIntegralType(useType);
@@ -103,8 +103,8 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        int stayIntegralCount=useIntegralService.getStayIntegralCount(m.getUserOpenid());
-        if(stayIntegralCount<0){
+        Integer stayIntegralCount=useIntegralService.getStayIntegralCount(m.getUserOpenid());
+        if(stayIntegralCount != null && stayIntegralCount<0){
             rm.setStatus(false);
             rm.setResultCode(ResultInfo.ERRORCODE);
             rm.setMessage(NameUtils.getConfig("ERRORINFO"));
@@ -149,17 +149,29 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        int useIntegralCount=useIntegralService.getUseIntegralCount(openid);
-        int gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
-        int stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
-        if(useIntegralCount<0||gainIntegralCount<0||stayIntegralCount<0){
+        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"));
+            return rm;
+        }
+        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(m.getUserOpenid());
+        useIntegral.setUserOpenId(m.getUserOpenid());
         useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);