Merge branch 'dev-resources-20181116' into test6.8.2

@@ -42,6 +42,9 @@
     <select id="selectTotalByCondition" resultType="java.lang.Integer">
         select count(1) from user_coupon
         where 1=1
+        <if test="param.couponId != null">
+            and coupon_Id=#{param.couponId}
+        </if>
         <if test="param.couponCode != null">
             and coupon_code=#{param.couponCode}
         </if>