红德堂-V1.2 1.app检查是否完成活动未抽奖查询修改、2.优惠券查询增加状态筛选条件

fs-service/src/main/java/com/fs/course/service/impl/FsCourseCheckinReceiveServiceImpl.java

@@ -369,6 +369,7 @@ public class FsCourseCheckinReceiveServiceImpl implements IFsCourseCheckinReceiv
         FsCourseCheckinReceive query = new FsCourseCheckinReceive();
         query.setActivityId(activityId);
         query.setUserId(userId);
+        query.setReceiveStatus(1);
         List<FsCourseCheckinReceive> list = fsCourseCheckinReceiveMapper.selectFsCourseCheckinReceiveList(query);
         return list != null ? list.size() : 0;
     }

fs-service/src/main/java/com/fs/his/mapper/FsCouponMapper.java

@@ -74,6 +74,7 @@ public interface FsCouponMapper
             "            <if test=\"eTime != null \">  and DATE(limit_time) &lt;= DATE(#{eTime})</if>\n" +
             "            <if test=\"couponType != null \"> and coupon_type = #{couponType}</if>\n" +
             "            <if test=\"price != null \"> and price = #{price}</if>\n" +
+            "            <if test=\"status != null \"> and status = #{status}</if>\n" +
             "</where>"+
             "order by coupon_id desc"+
             "</script>"})

fs-service/src/main/java/com/fs/his/param/FsCouponParam.java

@@ -41,5 +41,10 @@ public class FsCouponParam implements Serializable {
      */
     private Long goodsId;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 
 }