Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -844,7 +844,7 @@ public class DataImpl {
 
             Class.forName(driverClassName); //执行驱动
             con = DriverManager.getConnection(url, username, password); //获取连接
-            String sql = "select m.id,name,mobile,father_id,m.created_at,m.updated_at from merchants as m left join merchant_relation as mr on m.id = mr.child_id where is_own = 'no' and mobile not like '%&%'";
+            String sql = "select m.id,name,mobile,father_id,m.created_at,m.updated_at from merchants as m left join merchant_relation as mr on m.id = mr.child_id where is_own = 'no' and mobile not like '%&%' group by mobile";
             pstmt = con.prepareStatement(sql);
             ResultSet resultData = pstmt.executeQuery();
             //演出数据
@@ -889,6 +889,7 @@ public class DataImpl {
                     checkUserPerformances.setCheckUserPerformanceId(relationData.getInt("id") + "");
                     checkUserPerformances.setStatus(1);
                     checkUserPerformances.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("created_at").toString()));
+                    checkUserPerformances.setCanDownTime(checkUserPerformances.getCreatedAt());
                     if (null != relationData.getTimestamp("updated_at")) {
                         checkUserPerformances.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("updated_at").toString()));
                     }
@@ -902,7 +903,7 @@ public class DataImpl {
                 checkUserPerformanceVo.setRelationParams(voList);
 
                 dmCheckUserPerformanceService.saveBatch(checkUserPerformancesArrayList);
-                mongoTemplate.insert(checkUserPerformanceVo, KylinCheckUserPerformances.class.getSimpleName());
+                mongoTemplate.insert(checkUserPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
             }
             dmCheckUserService.saveBatch(checkUserList);
             mongoTemplate.insert(checkUserVoArrayList, KylinCheckUserVo.class.getSimpleName());