Merge branch 'dev' into test

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -69,13 +69,8 @@ liquidnet:
           addresses: 127.0.0.1:8090
   client:
     admin:
-      phpPayUrl: https://devdragon.zhengzai.tv
-      kylinApiUrl: https://devkylin.zhengzai.tv
-      phpServiceUrl: https://devservice.zhengzai.tv
-      phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
+      phpPayUrl: http://devdragon.zhengzai.tv
       phpMallUrl: https://devmall.zhengzai.tv
-      phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
-      phpPassportUrl: https://devpassport.zhengzai.tv
       platformUrl: https://devplatform.zhengzai.tv
       shunfeng:
         url: "https://butler-dev-ms.sf-express.com"

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -69,14 +69,9 @@ liquidnet:
           addresses: 172.17.121.166:8090
   client:
     admin:
-      phpPayUrl: https://testdragon.zhengzai.tv/
-      kylinApiUrl: https://testkylin.zhengzai.tv
-      phpServiceUrl: https://testservice.zhengzai.tv
-      phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
-      phpMallUrl: https://testmall.zhengzai.tv
-      phpMerchantApiUrl: https://testmerchantapi.zhengzai.tv
-      phpPassportUrl: https://testpassport.zhengzai.tv
-      platformUrl: https://testplatform.zhengzai.tv
+      phpPayUrl: http://testdragon.zhengzai.tv
+        phpMallUrl: https://testmall.zhengzai.tv
+        platformUrl: https://testplatform.zhengzai.tv
       shunfeng:
         url: "https://butler-dev-ms.sf-express.com"
         sk: 21e9a70f677a2bf29dfa2b3bead4f018

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()));
                     }