Merge remote-tracking branch 'origin/feature/1219_opt' into feature/1219_opt

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

@@ -3,7 +3,9 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.toolset.base.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ public class AlbumCategoryServiceImpl extends ServiceImpl<AlbumCategoryMapper, A
     @Autowired
     private MusicAlbumService musicAlbumService;
 
+    @Autowired
+    private AlbumMusicRelateService albumMusicRelateService;
     
     /**
      * 分页查询
@@ -65,6 +69,15 @@ public class AlbumCategoryServiceImpl extends ServiceImpl<AlbumCategoryMapper, A
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean del(Long id) {
+
+        // 判断是否被使用
+        Integer count = albumMusicRelateService.lambdaQuery()
+                .and(o -> o.eq(AlbumMusicRelate::getAlbumCategoryLevelId, id).or().eq(AlbumMusicRelate::getAlbumCategoryTypeId, id))
+                .count();
+        if (count > 0) {
+            throw new BizException("已被使用，不可删除");
+        }
+
         return this.removeById(id);
 
     }

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

@@ -183,13 +183,21 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
         if (CollectionUtils.isEmpty(list)) {
             return days;
         }
+        Date startTime = record.getStartTime();
+        if (startTime.after(new Date())) {
+            startTime = addTime(startTime, PeriodEnum.DAY, -1,1);
+        } else {
+            startTime = addTime(new Date(), PeriodEnum.DAY, -1,1);
+        }
         List<DiscountCardRecord> updateList = new ArrayList<>();
         for (DiscountCardRecord discountCardRecord : list) {
             DiscountCardRecord cardRecord = new DiscountCardRecord();
             cardRecord.setId(discountCardRecord.getId());
-            cardRecord.setStartTime(addTime(discountCardRecord.getStartTime(), PeriodEnum.DAY, -days,0));
-            cardRecord.setEndTime(addTime(discountCardRecord.getEndTime(), PeriodEnum.DAY, -days,1));
+            cardRecord.setStartTime(startTime);
+            cardRecord.setEndTime(addTime(cardRecord.getStartTime(), discountCardRecord.getType(), discountCardRecord.getTimes(), 1));
+            formatVipRecordTime(cardRecord);
             updateList.add(cardRecord);
+            startTime = cardRecord.getEndTime();
         }
         this.updateBatchById(updateList);
 

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

@@ -730,13 +730,21 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
         if (CollectionUtils.isEmpty(list)) {
             return days;
         }
+        Date startTime = record.getStartTime();
+        if (startTime.after(new Date())) {
+            startTime = addTime(startTime, PeriodEnum.DAY, -1,1);
+        } else {
+            startTime = addTime(new Date(), PeriodEnum.DAY, -1,1);
+        }
         List<UserTenantAlbumRecord> updateList = new ArrayList<>();
         for (UserTenantAlbumRecord discountCardRecord : list) {
             UserTenantAlbumRecord cardRecord = new UserTenantAlbumRecord();
             cardRecord.setId(discountCardRecord.getId());
-            cardRecord.setStartTime(addTime(discountCardRecord.getStartTime(), PeriodEnum.DAY, -days,0));
-            cardRecord.setEndTime(addTime(discountCardRecord.getEndTime(), PeriodEnum.DAY, -days,1));
+            cardRecord.setStartTime(startTime);
+            cardRecord.setEndTime(addTime(cardRecord.getStartTime(), PeriodEnum.valueOf(discountCardRecord.getType()), discountCardRecord.getTimes(), 1));
+            formatVipRecordTime(cardRecord);
             updateList.add(cardRecord);
+            startTime = cardRecord.getEndTime();
         }
         this.updateBatchById(updateList);
 

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

@@ -583,12 +583,13 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                     } else {
                         vipCardRecord.setStartTime(addTime(now,PeriodEnum.DAY,1,0));
                     }
+                    vipCardRecord.setStatus(EVipRecordStatus.UPDATE);
                 }
 
                 VipCardRecord record = new VipCardRecord();
                 record.setStartTime(addTime(vipCardRecord.getStartTime(), addVipCardRecord.getType(), addVipCardRecord.getTimes(),0));
                 record.setEndTime(addTime(vipCardRecord.getEndTime(), addVipCardRecord.getType(), addVipCardRecord.getTimes(),1));
-
+                record.setStatus(vipCardRecord.getStatus());
                 record.setId(vipCardRecord.getId());
                 updateList.add(record);
             }
@@ -683,14 +684,27 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                 .eq(VipCardRecord::getEfficientFlag, 1)
                 .list();
 
+        Date startTime = record.getStartTime();
+        if (startTime.after(new Date())) {
+            startTime = addTime(startTime, PeriodEnum.DAY, -1,1);
+        } else {
+            startTime = addTime(new Date(), PeriodEnum.DAY, -1,1);
+        }
         if (CollectionUtils.isNotEmpty(list)) {
             List<VipCardRecord> updateList = new ArrayList<>();
             for (VipCardRecord vipCardRecord1 : list) {
                 VipCardRecord cardRecord = new VipCardRecord();
                 cardRecord.setId(vipCardRecord1.getId());
-                cardRecord.setStartTime(addTime(vipCardRecord1.getStartTime(), PeriodEnum.DAY, -days,0));
-                cardRecord.setEndTime(addTime(vipCardRecord1.getEndTime(), PeriodEnum.DAY, -days,1));
+                if (vipCardRecord1.getStatus() == EVipRecordStatus.UPDATE) {
+                    cardRecord.setStartTime(addTime(vipCardRecord1.getStartTime(), PeriodEnum.DAY, -days,0));
+                    cardRecord.setEndTime(addTime(vipCardRecord1.getEndTime(), PeriodEnum.DAY, -days,1));
+                } else {
+                    cardRecord.setStartTime(startTime);
+                    cardRecord.setEndTime(addTime(cardRecord.getStartTime(), vipCardRecord1.getType(), vipCardRecord1.getTimes(), 1));
+                }
+                formatVipRecordTime(cardRecord);
                 updateList.add(cardRecord);
+                startTime = cardRecord.getEndTime();
             }
             this.updateBatchById(updateList);
         }