Merge branch 'feat-zy-1002779' into 'master'

修改过期的券不展示

See merge request rays/pcloud-book!652

pcloud-service-book/src/main/java/com/pcloud/book/giftcoupon/dto/GiftPackageDTO.java

@@ -49,7 +49,7 @@ public class GiftPackageDTO {
     private Integer receiveLimit;
 
     /**
-     * (1-未开始，2-进行中，3-已结束)
+     * (1-未开始，2-进行中，3-已结束,4-未结束)
      */
     private Integer state;
     /**

pcloud-service-book/src/main/resources/mapper/giftConpon/GiftCouplePackageDao.xml

@@ -147,6 +147,9 @@
         <if test="state !=null and state==3">
             and now() > a.valid_date_end
         </if>
+        <if test="state !=null and state==4">
+            and now() <![CDATA[ <= ]]> a.valid_date_end
+        </if>
         GROUP BY a.id
         order by a.update_time desc
 

pcloud-service-book/src/main/resources/mapper/rightssetting/RightNowItem.xml

@@ -101,6 +101,7 @@
         WHERE
         t1.is_delete = 0
         AND t.rights_setting_id = #{rightsSettingId}
+        and now() <![CDATA[ <= ]]> t1.valid_date_end
     </select>
 
 </mapper>
\ No newline at end of file