Merge branch 'feature/1219_opt' into test

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

@@ -167,8 +167,13 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             detail.setActivityRewardList(activityRewardList);
         }
         //获取已购买次数
-        Long userId = sysUserService.getUserId();
-        detail.setBuyNum(userPaymentCoreService.getActivityCount(userId,ClientEnum.STUDENT,id));
+        try {
+
+            Long userId = sysUserService.getUserId();
+            detail.setBuyNum(userPaymentCoreService.getActivityCount(userId,ClientEnum.STUDENT,id));
+        }catch (Exception e) {
+            log.error("用户未登陆");
+        }
         return detail;
     }
 

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

@@ -891,11 +891,13 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             info.setPerpetualFlag(CollectionUtils.isNotEmpty(collect));
             int surplusDay = 0;
             if (CollectionUtils.isNotEmpty(v)) {
-                Date endTime = v.get(0).getEndTime();
-                if (v.get(0).getStartTime().before(new Date())) {
-                    surplusDay += DateUtil.daysBetweenUp(new Date(), endTime);
-                } else {
-                    surplusDay += DateUtil.daysBetweenUp(v.get(0).getStartTime(), endTime);
+                for (UserTenantAlbumRecord userTenantAlbumRecord : v) {
+                    Date endTime = userTenantAlbumRecord.getEndTime();
+                    if (userTenantAlbumRecord.getStartTime().before(new Date())) {
+                        surplusDay += DateUtil.daysBetweenUp(new Date(), endTime);
+                    } else {
+                        surplusDay += DateUtil.daysBetweenUp(userTenantAlbumRecord.getStartTime(), endTime);
+                    }
                 }
             }
             info.setSurplusDay(surplusDay);

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

@@ -737,7 +737,12 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         // 计算天数
         int vipDays = 0;
         if (CollectionUtils.isNotEmpty(vipList)) {
-            vipDays = vipList.stream().mapToInt(o -> DateUtil.daysBetweenUp(o.getStartTime(), o.getEndTime())).sum();
+            vipDays = vipList.stream().map(o-> {
+                if (o.getStartTime().before(new Date())) {
+                    o.setStartTime(new Date());
+                }
+                return o;
+            }).mapToInt(o -> DateUtil.daysBetweenUp(o.getStartTime(), o.getEndTime())).sum();
         }
         info.setSurplusVipDay(vipDays);
         // 过滤出SVIP
@@ -745,7 +750,12 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         // 计算天数
         int svipDays = 0;
         if (CollectionUtils.isNotEmpty(svipList)) {
-            svipDays = svipList.stream().mapToInt(o -> DateUtil.daysBetweenUp(o.getStartTime(), o.getEndTime())).sum();
+            svipDays = svipList.stream().map(o-> {
+                if (o.getStartTime().before(new Date())) {
+                    o.setStartTime(new Date());
+                }
+                return o;
+            }).mapToInt(o -> DateUtil.daysBetweenUp(o.getStartTime(), o.getEndTime())).sum();
         }
         info.setSurplusSvipDay(svipDays);
         // 过滤出永久SVIP