Merge branch 'pre' into 'master'

minusMinutes

See merge request !151

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/sweet/TaskController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -47,7 +48,7 @@ public class TaskController {
         int size = 1000;
 
         LocalDateTime localDateTime = LocalDateTime.now();
-        LocalDateTime newTime = localDateTime.minusHours(10);
+        LocalDateTime newTime = localDateTime.minusMinutes(10);
 //        String timeStr = "2021-12-28 00:00:00";
 //        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 //        LocalDateTime dateTime = LocalDateTime.parse(timeStr, df);
@@ -62,7 +63,9 @@ public class TaskController {
         countPage = countPage + 1;
         for (int page = 0; page < countPage; page++) {
             List<SweetWechatUsers> sweetWechatUsers = usersMapper.selectList(
-                    Wrappers.lambdaQuery(SweetWechatUsers.class).last("limit " + (page * size) + "," + ((page + 1) * size))
+                    Wrappers.lambdaQuery(SweetWechatUsers.class)
+                            .gt(SweetWechatUsers::getCreatedAt, newTime)
+                            .last("limit " + (page * size) + "," + ((page + 1) * size))
             );
             for (SweetWechatUsers info : sweetWechatUsers) {
                 try {
@@ -70,7 +73,8 @@ public class TaskController {
                     if (sweetAppletUsers != null) {
                         if (sweetAppletUsers.getUserId() != null && !sweetAppletUsers.getUserId().isEmpty()) {
                             log.info("followDoTask userId:{}", sweetAppletUsers.getUserId());
-                            feignStoneIntegralClient.doTask(4, sweetAppletUsers.getUserId());
+                            ResponseDto<HashMap<String, Object>> hashMapResponseDto = feignStoneIntegralClient.doTask(4, sweetAppletUsers.getUserId());
+                            //log.info("followDoTask res:{}", hashMapResponseDto);
                         }
                     }
                 } catch (Exception e) {