Merge remote-tracking branch 'origin/master'

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

@@ -233,10 +233,11 @@ public class AppUserCountTask {
             Date curDate = new Date();
             String dateTime = DateUtil.format(curDate, "yyyy-MM-dd");
             Date lastDate = appUserCountService.selectLastDate();
-            String lastDateStr = DateUtil.format(lastDate,"yyyy-MM-dd HH:mm:ss");
+            /*String lastDateStr = DateUtil.format(lastDate,"yyyy-MM-dd HH:mm:ss");
             if(!dateTime.equals(DateUtil.format(lastDate,"yyyy-MM-dd"))){
                 lastDateStr = DateUtil.format(curDate, "yyyy-MM-dd").concat(" 00:00:00");
-            }
+            }*/
+            String lastDateStr = DateUtil.format(curDate, "yyyy-MM-dd" + " 00:00:00");
             String endTimeStr = DateUtil.format(curDate,"yyyy-MM-dd HH:mm:ss");
             AppUser queryUser = new AppUser();
             queryUser.setAgentFlag(1);
@@ -295,6 +296,7 @@ public class AppUserCountTask {
                                     profitTypeList.contains(e.getTranType3()) &&
                                     FinTranType1.U_Income_Coin.getType() == e.getTranType1().intValue()
                     ).mapToDouble(FinTranRecord::getCoinChange).sum());
+                    appUserCount.setUpdate(true);
                     appUserCountService.createAppUserCount(appUserCount);
                 });
             }