商品更新下架

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -93,6 +93,6 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	@ApiModelProperty("查询超过过期时间，未消耗考试次数 1")
 	private Long exceed;
 
-	@ApiModelProperty("查询超过过期时间，考试次数 1")
+	@ApiModelProperty("查询超过过期时间，考试次数 1过期 2不过期")
 	private Long exceedExamExpend;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -112,9 +112,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           <if test="beforeId != null ">
             and us.before_id =#{beforeId}
         </if>
-        <if test="exceedExamExpend != null ">
+        <if test="exceedExamExpend != null and exceedExamExpend = 1">
             and us.exam_expend  = 1
         </if>
+        <if test="exceedExamExpend != null and exceedExamExpend = 2">
+            and (us.exam_expend  is null or us.exam_expend = 0)
+        </if>
         <if test="exceed != null ">
             and unix_timestamp(now()) > us.apply_site_exam_time and us.exam_expend is NULL and us.subscribe_status = 1
         </if>