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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -420,7 +420,7 @@ public class AdamLoginController {
 
         String smsCodeByMobile = adamRdmService.getSmsCodeByMobile(mobile);
         if (null == smsCodeByMobile) {
-            return ResponseDto.failure(ErrorMapping.get("10003"));
+            return ResponseDto.failure(ErrorMapping.get("10004"));
         }
         return smsCodeByMobile.equals(code) ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("10004"));
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -325,7 +325,7 @@ public class AdamUserController {
 //        }
         String smsCodeByMobile = adamRdmService.getSmsCodeByMobile(mobile);
         if (null == smsCodeByMobile) {
-            return ResponseDto.failure(ErrorMapping.get("10003"));
+            return ResponseDto.failure(ErrorMapping.get("10004"));
         }
         return smsCodeByMobile.equals(code) ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("10004"));
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -7,7 +7,7 @@
 10001=
 10002=验证码发送失败
 10003=已超时，请重新获取验证码
-10004=手机验证码错误
+10004=验证码错误，请重新输入
 10005=手机号获取失败，请更换登录方式
 10006=第三方账号未注册
 10007=该第三方账号已经被其他用户绑定

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

@@ -458,7 +458,7 @@ public class DataImpl {
 
             Class.forName(driverClassName); //执行驱动
             con = DriverManager.getConnection(url, username, password); //获取连接
-            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id  > 5721 and status != 2 and created_at like '2021-" + month + "%'"; //设置的预编译语句格式
+            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id  > 5721 and status != 2 and status != 1 and created_at like '2021-" + month + "%'"; //设置的预编译语句格式
 //            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id = "+month + " and status != 2 and status !=-1"; //设置的预编译语句格式
             System.out.println(" SQL COUNT = " + sqlAllCount);
             pstmt = con.prepareStatement(sqlAllCount);
@@ -479,7 +479,7 @@ public class DataImpl {
                 ArrayList<KylinOrderTicketVo> orderListVo = new ArrayList();
                 ArrayList<KylinOrderTicketEntitiesVo> orderEntitiesListVo = new ArrayList();
                 //订单
-                String sql = "select * from order_tickets where performance_id  > 5721 and status != 2 and created_at like '2021-" + month + "%' limit " + count * page + " ," + count; //设置的预编译语句格式
+                String sql = "select * from order_tickets where performance_id  > 5721 and status != 2 and and status != 1 created_at like '2021-" + month + "%' limit " + count * page + " ," + count; //设置的预编译语句格式
 //                String sql = "select *  from order_tickets where performance_id = "+month +" and status != 2 limit " + count * page + " ," + count;
                 System.out.println(" SQL DATA = " + sql);
                 pstmt = con.prepareStatement(sql);