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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -35,7 +35,9 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from enters where (type <> 1 or (type = 1 and is_certification = 'yes')) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from (\n" +
+                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()\n" +
+                "                  ) tk where tk.rn=1 ";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -105,9 +105,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         thirdPartyList.add(thirdParty);
                         vos.add(vo);
 
-                        if (currentYear.isBefore(createdAt)) {
-                            dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
-                        }
+                        dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
                     }
                     if (thirdPartyList.size() == 500 || (thirdPartyList.size() > 0 && smFlg)) {
                         tl += thirdPartyList.size();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -142,8 +142,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         userInfoList.add(userInfo);
                         vos.add(vo);
 
-                        if (StringUtils.length(mobile) == 11 &&
-                                (currentYear.isBefore(createdAt) || currentYear.isBefore(updatedAt))) {
+                        if (StringUtils.length(mobile) == 11) {
                             dmRdmService.setUidByMobile(mobile, uid);
                         }
                     }