Эх сурвалжийг харах

bugfix:签到天数问题,邀请人NickName(设置为邀请人)

lyx 2 сар өмнө
parent
commit
ef1f457d2b

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/impl/ActivityInviteConfigServiceImpl.java

@@ -258,8 +258,8 @@ public class ActivityInviteConfigServiceImpl extends ServiceImpl<ActivityInviteC
                    activityInviteLog.setInvitedUserId(invitedUserId);
                    activityInviteLog.setActivityId(activityInviteConfig.getId());
 
-                   if(StringUtils.isNotBlank(invitedLifeUser.getUserName())){
-                       activityInviteLog.setNickName(invitedLifeUser.getUserName());
+                   if(StringUtils.isNotBlank(originalLifeUser.getUserName())){
+                       activityInviteLog.setNickName(originalLifeUser.getUserName());
                    }
                    // 邀请奖励
                    activityInviteLog.setInviteRewardType(activityInviteConfig.getInviteRewardType());

+ 2 - 3
alien-store/src/main/java/shop/alien/store/service/impl/SignInServiceImpl.java

@@ -16,8 +16,8 @@ import shop.alien.entity.store.vo.SignInVo;
 import shop.alien.entity.store.vo.UserSignInRecordVo;
 import shop.alien.mapper.ActivityPeriodMapper;
 import shop.alien.mapper.ActivitySignInConfigMapper;
-import shop.alien.mapper.UserSignInRecordMapper;
 import shop.alien.mapper.ActivitySignRewardMapper;
+import shop.alien.mapper.UserSignInRecordMapper;
 import shop.alien.mapper.system.SignInActivityMapper;
 import shop.alien.store.service.SignInService;
 
@@ -26,7 +26,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -322,7 +321,7 @@ public class SignInServiceImpl extends ServiceImpl<UserSignInRecordMapper, UserS
         UserSignInRecord userSignInRecord = userSignInRecordList.get(0);
         Date signInDate = userSignInRecord.getSignInDate();
         boolean result = isSameDay(signInDate, dayCount);
-        if(result){
+        if(!result){
             return userSignInRecord.getTotalContinuousDays();
         } else{
             return 0;