Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/controller/AffiliateController.java

@@ -64,8 +64,8 @@ public class AffiliateController {
 
     /*@ApiOperation(value = "每月发送结算邮件")
     @GetMapping("/commissionCalculation")
-    public Response<String> commissionCalculation() {
-        affiliateService.commissionCalculation(null, null);
+    public Response<String> commissionCalculation(@RequestParam("year") Integer year, @RequestParam("month") Integer month) {
+        affiliateService.commissionCalculation(year, month);
         return Response.success("success ");
     }*/
 

src/main/java/com/ai/da/mapper/primary/AccountMapper.java

@@ -30,6 +30,6 @@ public interface AccountMapper extends CommonMapper<Account> {
      */
 //    Account findById(String id);
 
-    void toVisitor(Long id, Date date);
+    void toVisitor(Long id);
 
 }

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -1501,6 +1501,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                     maxUserId = queryOrderResultSet.getLong("max_id");
                     // 获取历史最大用户id
                     long maxUserIdHistory = StringUtil.isNullOrEmpty(redisUtil.getFromString(maximumUserIdKey)) ? CommonConstant.MAXIMUM_USER_ID : Long.parseLong(redisUtil.getFromString(maximumUserIdKey));
+                    log.info("Code-Create Maximum User ID last time : {}", maxUserIdHistory);
+                    log.info("Currently Code-Create Maximum User ID : {}", maxUserIdHistory);
                     if (maxUserId > maxUserIdHistory){
                         // 查出新增用户的邮箱
                         PreparedStatement newUserEmail = connection.prepareStatement(QUERY_NEW_USER_EMAIL);
@@ -1744,7 +1746,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     }
 
     public void toVisitor(Account account){
-        accountMapper.toVisitor(account.getId(), new Date());
+        accountMapper.toVisitor(account.getId());
     }
 
     public List<Long> setUserValidToDayEnd(){