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-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -22,7 +22,7 @@
           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="integralType != null||integralType != ''">
+            <if test="integralType != null and integralType != ''">
                AND i.integral_type = #{integralType}
             </if>
         ORDER BY i.integral_id DESC
@@ -36,19 +36,19 @@
 
     <!--获得的总积分数-->
     <select id="getGainIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(integral_number)
+        SELECT SUM(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=1
     </select>
     <!--使用的总积分数-->
     <select id="getUseIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(integral_number)
+        SELECT SUM(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=2
     </select>
     <!--待入账的总积分数-->
     <select id="getStayIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(stay_number)
+        SELECT SUM(stay_number)
         FROM tb_iamberry_stay_integral
         WHERE user_openid=#{userOpenid} AND stay_status=1
     </select>