修复发放用户

game-business/src/main/java/com/game/business/service/impl/AppUserCountServiceImpl.java

@@ -73,9 +73,9 @@ public class AppUserCountServiceImpl extends ServiceImpl<AppUserCountMapper, App
             res = appUserCountMapper.insert(appUserCount);
         }else{
             appUserCount.setId(userCount.getId());
-            if(null == appUserCount.getUpdateTime()) {
+            /*if(null == appUserCount.getUpdateTime()) {
                 appUserCount.setUpdateTime(new Date());
-            }
+            }*/
             if(!appUserCount.isUpdate()) {
                 //非全量更新
                 if (appUserCount.getRechargeAmount() > 0) {

game-business/src/main/java/com/game/business/task/AppUserCountTask.java

@@ -167,7 +167,7 @@ public class AppUserCountTask {
      * 统计用户直播/充值 (增量更新 1分钟)
      * */
     public void statisticsLive(){
-        log.info("开始统计用户每日直播、游戏、佣金");
+        log.info("开始增量更新用户每日直播、佣金");
         try {
             Long userId = null;
             Date curDate = new Date();
@@ -183,7 +183,7 @@ public class AppUserCountTask {
             List<AppUser> list = appUserService.selectAppUserList(queryUser);//查询所有代理用户
             List<AppUsersCharge> appUsersChargeList = appUsersChargeService.getChargeList(userId, lastDateStr, endTimeStr);
             List<AppUsersCashrecord> appUsersCashrecords = appUsersCashrecordService.getUserCashList(userId, lastDateStr, endTimeStr);
-            List<FinTranRecord> finTranRecordList = finTranRecordService.getUserRecordList(String.valueOf(userId), lastDateStr, endTimeStr);
+            List<FinTranRecord> finTranRecordList = finTranRecordService.getUserRecordList(null!=userId?String.valueOf(userId):null, lastDateStr, endTimeStr);
             List<AppUserLiveDividedRecord> liveDividedRecordList = appUserLiveDividedRecordService.selectByDate(userId, lastDateStr, endTimeStr);
             if (null != list && list.size() > 0) {
                 List<AppUserCount> appUserCountList = new ArrayList<>();
@@ -222,9 +222,9 @@ public class AppUserCountTask {
                 });
             }
         }catch (Exception e){
-            log.info("用户每日直播、佣金统计异常：{}",e.getMessage());
+            log.info("增量更新用户每日直播、佣金统计异常：{}",e.getMessage());
         }
-        log.info("用户每日直播、佣金统计完成");
+        log.info("增量更新用户每日直播、佣金统计完成");
 
     }