酷乐秀优化

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/DiscountCardRecordServiceImpl.java

@@ -392,7 +392,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
 
     @Override
     public void pollExpireMsg() {
-        //会员提前三天提示
+        //畅学卡提前三天提示
         List<DiscountCardRecord> records = this.lambdaQuery()
                 .eq(DiscountCardRecord::getEfficientFlag, true)
                 .eq(DiscountCardRecord::getMsgStatus, 0)
@@ -408,7 +408,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
             baseMapper.updateMsgStatus(ids,1);
         }
 
-        //会员到期提示
+        //畅学卡到期提示
         List<DiscountCardRecord> expireRecords = this.lambdaQuery()
                 .eq(DiscountCardRecord::getEfficientFlag, true)
                 .in(DiscountCardRecord::getMsgStatus, 0,1)

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserTenantAlbumRecordMapper.xml

@@ -95,7 +95,7 @@
         ) a
         left join user_tenant_album_record t on a.id_ = t.id_
         left join sys_user u on t.user_id_ = u.id_
-        where DATE_ADD(now(), INTERVAL 4 DAY) > t.end_time_
+        where DATE_FORMAT(DATE_ADD(now(), INTERVAL 3 DAY),'%Y-%m-%d') = DATE_FORMAT(t.end_time_,'%Y-%m-%d')
         and (msg_status_ = 0 or msg_status_ is null)
         order by end_time_ desc
     </select>
@@ -109,7 +109,7 @@
         ) a
         left join user_tenant_album_record t on a.id_ = t.id_
         left join sys_user u on t.user_id_ = u.id_
-        where DATE_ADD(now(), INTERVAL 1 DAY) > t.end_time_
+        where DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(t.end_time_,'%Y-%m-%d')
         and (msg_status_ IN (0,1) or msg_status_ is null)
         order by end_time_ desc
     </select>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VipCardRecordMapper.xml

@@ -95,12 +95,10 @@
         , max(if(vip_type_ = 'SVIP', end_time_, null)) svipEndTime
         from (select id_,user_id_,client_type_,vip_type_,end_time_
         from vip_card_record
-        where efficient_flag_ = 1
-        and end_time_ > now()
-        having 1
+        where efficient_flag_ = 1 and msg_status_ = 0
+        and DATE_FORMAT(DATE_ADD(now(), INTERVAL 3 DAY),'%Y-%m-%d') = DATE_FORMAT(end_time_,'%Y-%m-%d')
         order by end_time_ desc) t
         group by t.user_id_, t.client_type_, t.vip_type_
-        having (DATE_ADD(now(), INTERVAL 4 DAY) > vipEndTime or DATE_ADD(now(), INTERVAL 4 DAY) > svipEndTime)
         ) a
         left join vip_card_record t on a.id_ = t.id_
         left join sys_user u on t.user_id_ = u.id_
@@ -120,12 +118,10 @@
             , max(if(vip_type_ = 'SVIP', end_time_, null)) svipEndTime
             from (select id_,user_id_,client_type_,vip_type_,end_time_
             from vip_card_record
-            where efficient_flag_ = 1
-            and msg_status_ in (0,1)
-            having 1
+            where efficient_flag_ = 1 and msg_status_ in (0,1)
+            and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(end_time_,'%Y-%m-%d')
             order by end_time_ desc) t
             group by t.user_id_, t.client_type_, t.vip_type_
-            having (DATE_ADD(now(), INTERVAL 1 DAY) > vipEndTime or DATE_ADD(now(), INTERVAL 1 DAY) > svipEndTime)
         ) a
         left join vip_card_record t on a.id_ = t.id_
         left join sys_user u on t.user_id_ = u.id_