fix: 游客登陆保存记录视频广告记录，不计入用户统计信息

yt-adage/adage-service/src/main/java/com/ytpm/adage/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-algebraic/algebraic-service/src/main/java/com/ytpm/algebraic/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-allusion/allusion-service/src/main/java/com/ytpm/allusion/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-answer/answer-service/src/main/java/com/ytpm/answer/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-arena/arena-service/src/main/java/com/ytpm/arena/service/impl/AdServiceImpl.java

@@ -313,12 +313,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-arithmetic/arithmetic-service/src/main/java/com/ytpm/arithmetic/service/impl/AdServiceImpl.java

@@ -313,12 +313,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-calculator/calculator-service/src/main/java/com/ytpm/calculator/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-carp/carp-service/src/main/java/com/ytpm/carp/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-countstep/countstep-service/src/main/java/com/ytpm/countstep/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-diary/diary-service/src/main/java/com/ytpm/diary/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-dtw/dtw-service/src/main/java/com/ytpm/dtw/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-emoticons/emoticons-service/src/main/java/com/ytpm/emoticons/service/impl/AdServiceImpl.java

@@ -319,12 +319,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-funarith/funarith-service/src/main/java/com/ytpm/funarith/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-idiom/idiom-service/src/main/java/com/ytpm/idiom/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-irun/irun-service/src/main/java/com/ytpm/irun/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-lemon/lemon-service/src/main/java/com/ytpm/lemon/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-lime/lime-service/src/main/java/com/ytpm/lime/service/impl/AdServiceImpl.java

@@ -321,12 +321,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-mileage/mileage-service/src/main/java/com/ytpm/mileage/service/impl/AdServiceImpl.java

@@ -321,12 +321,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-nofeeds/nofeeds-service/src/main/java/com/ytpm/nofeeds/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-picking/picking-service/src/main/java/com/ytpm/picking/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-proverb/proverb-service/src/main/java/com/ytpm/proverb/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-raisepig/raisepig-service/src/main/java/com/ytpm/raisepig/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-summary/summary-service/src/main/java/com/ytpm/summary/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-typing/typing-service/src/main/java/com/ytpm/typing/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-vitality/vitality-service/src/main/java/com/ytpm/vitality/service/impl/AdServiceImpl.java

@@ -319,12 +319,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-walk/walk-service/src/main/java/com/ytpm/walk/service/impl/AdServiceImpl.java

@@ -320,12 +320,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }
 

yt-walking/walking-service/src/main/java/com/ytpm/walking/service/impl/AdServiceImpl.java

@@ -321,12 +321,20 @@ public class AdServiceImpl implements AdService {
         } else {
             adRecordMapper.addOne(adRecord);
         }
-        //修改用户信息， 广告次数+1  总收益 + revenue
-        YtDyzUser dyzUser = new YtDyzUser();
-        dyzUser.setUserId(user.getUserId());
-        dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo())?1:(user.getTotalVideo()+1));
-        dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
-        appUserMapper.updateUser(dyzUser);
+        boolean updateUserTotal = true;
+        // 游客登陆下 激励视频广告记录不算入用户统计
+        if (AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
+                && AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            updateUserTotal = false;
+        }
+        if (updateUserTotal) {
+            //修改用户信息， 广告次数+1  总收益 + revenue
+            YtDyzUser dyzUser = new YtDyzUser();
+            dyzUser.setUserId(user.getUserId());
+            dyzUser.setTotalVideo(Objects.isNull(user.getTotalVideo()) ? 1 : (user.getTotalVideo() + 1));
+            dyzUser.setTotalIncome(user.getTotalIncome().add(param.getRevenue()));
+            appUserMapper.updateUser(dyzUser);
+        }
         return adRecord.getRecordId();
     }