硬件升级功能

smart-switch-service/src/main/java/com/ruoyi/ss/vip/mapper/VipMapper.xml

@@ -72,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.surplusCountStart != null">and sv.surplus_count &gt;= #{query.surplusCountStart}</if>
         <if test="query.surplusCountEnd != null">and sv.surplus_count &lt;= #{query.surplusCountEnd}</if>
         <if test="query.nextResetDate != null">and date(sv.next_reset_time) = #{query.nextResetDate}</if>
+        <if test="query.vipMchId != null">and svl.mch_id = #{query.vipMchId}</if>
         <if test="query.inValid != null">
             and
             <if test="!query.inValid">
@@ -104,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        
+
     </sql>
 
     <select id="selectVipList" parameterType="VipQuery" resultMap="VipResult">
@@ -220,10 +221,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         set sv.round_count = sv.round_count + 1,
             sv.total_count = sv.total_count + 1,
             sv.surplus_count = sv.surplus_count - 1
-        where sv.id = #{id} 
+        where sv.id = #{id}
             and sv.deleted = false
             and sv.surplus_count > 0
-            and <include refid="inValid"/> 
+            and <include refid="inValid"/>
             and not <include refid="inLimit"/>
     </update>
 
@@ -234,5 +235,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sv.surplus_count = sv.surplus_count + 1
         where sv.id = #{id}
             and sv.deleted = false
-    </update>    
+    </update>
 </mapper>