1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -401,16 +401,26 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      * @throws ServiceException
      */
     @Override
-    public String sendVerifyCode(String phone,String identification) throws ServiceException {
+    public String sendVerifyCode(String phone, String identification) throws ServiceException {
         if (StringUtils.isEmpty(phone)) {
             throw new AppServiceException(ExceptionDefinition.USER_PHONE_HAS_ENTRY);
         }
-        //2.校验用户是否存在
-        List<CommonUser> targetUserList = this.selectList(
-                new EntityWrapper<CommonUser>()
-                        .eq("phone", phone).eq("identification", identification));
-        if (CollectionUtils.isEmpty(targetUserList)) {
-            throw new AppServiceException(ExceptionDefinition.USER_PHONE_NOT_EXIST);
+        //pc端
+        if ("3".equals(identification)) {
+            //2.校验pc用户是否存在
+            List<CommonStaff> commonStaffList = commonStaffService.selectList(new EntityWrapper<CommonStaff>()
+                    .eq("staff_mobile_phone", phone).eq("enabled", "1").eq("delete_flag", "0"));
+            if (CollectionUtils.isEmpty(commonStaffList)) {
+                throw new AppServiceException(ExceptionDefinition.USER_PHONE_NOT_EXIST);
+            }
+        } else {
+            //2.校验用户是否存在
+            List<CommonUser> targetUserList = this.selectList(
+                    new EntityWrapper<CommonUser>()
+                            .eq("phone", phone).eq("identification", identification));
+            if (CollectionUtils.isEmpty(targetUserList)) {
+                throw new AppServiceException(ExceptionDefinition.USER_PHONE_NOT_EXIST);
+            }
         }
         String verifyCode = GeneratorUtil.genSixVerifyCode();
         System.out.println("verifyCode:" + verifyCode);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -55,12 +55,13 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     @Transactional
     @Scheduled(cron = "0 */1 * * * ?")
     public void queryResults() throws IOException {
-        //获取token
-        String token = EntityAnalyse.GetJTToken();
+
         //查询司机上报结果
         List<HyDriverInfo> hyDriverInfoList = this.selectList(new EntityWrapper<HyDriverInfo>()
         .eq("escalation_status_key","5").eq("delete_flag","0"));
         if (!CollectionUtils.isEmpty(hyDriverInfoList)){
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
             for (HyDriverInfo hyDriverInfo : hyDriverInfoList){
                 //上报司机信息校验结果查询
                 hyDriverInfo.setToken(token);
@@ -82,6 +83,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         List<HyDriverCarInfo> hyDriverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>()
                 .eq("escalation_status_key","5").eq("delete_flag","0"));
         if (!CollectionUtils.isEmpty(hyDriverCarInfoList)){
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
             for (HyDriverCarInfo hyDriverCarInfo : hyDriverCarInfoList){
                 //上报车辆信息校验结果查询
                 hyDriverCarInfo.setToken(token);
@@ -103,6 +106,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         List<OrderInfo> orderInfoList = orderInfoService.selectList(new EntityWrapper<OrderInfo>()
                 .eq("escalation_status_key","5").eq("delete_flag","0"));
         if (!CollectionUtils.isEmpty(orderInfoList)){
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
             for (OrderInfo orderInfo : orderInfoList){
                 //上报车辆信息校验结果查询
                 orderInfo.setToken(token);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -472,8 +472,8 @@ public class EntityAnalyse {
             // 执行请求操作，并拿到结果（同步阻塞）
             String body = EntityUtils.toString(response.getEntity());
             JSONObject jsonObject = JSONObject.parseObject(body);
-            if ("异常".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                JSONArray jsonArray = jsonObject.getJSONObject("result").getJSONArray("validateResult");
+            if ("异常".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                JSONArray jsonArray = jsonObject.getJSONArray("result").getJSONObject(0).getJSONArray("validateResult");
                 String result = "";
                 for (int i = 0; i < jsonArray.size(); i++) {
                     if ("异常".equals(jsonArray.getJSONObject(i).getString("flag"))) {
@@ -482,12 +482,12 @@ public class EntityAnalyse {
                 }
                 System.out.println("result = " + result);
                 return result;
-            } else if ("待校验".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
+            } else if ("待校验".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
                 String result = "待校验";
                 System.out.println("result = " + result);
                 return result;
-            } else if ("通过".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                String result = jsonObject.getJSONObject("result").getString("validateStatus");
+            } else if ("通过".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                String result = (jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"));
                 System.out.println("result = " + result);
                 return result;
             }
@@ -529,8 +529,8 @@ public class EntityAnalyse {
             // 执行请求操作，并拿到结果（同步阻塞）
             String body = EntityUtils.toString(response.getEntity());
             JSONObject jsonObject = JSONObject.parseObject(body);
-            if ("异常".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                JSONArray jsonArray = jsonObject.getJSONObject("result").getJSONArray("validateResult");
+            if ("异常".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                JSONArray jsonArray = jsonObject.getJSONArray("result").getJSONObject(0).getJSONArray("validateResult");
                 String result = "";
                 for (int i = 0; i < jsonArray.size(); i++) {
                     if ("异常".equals(jsonArray.getJSONObject(i).getString("flag"))) {
@@ -539,12 +539,12 @@ public class EntityAnalyse {
                 }
                 System.out.println("result = " + result);
                 return result;
-            } else if ("待校验".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
+            } else if ("待校验".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
                 String result = "待校验";
                 System.out.println("result = " + result);
                 return result;
-            } else if ("通过".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                String result = jsonObject.getJSONObject("result").getString("validateStatus");
+            } else if ("通过".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                String result = (jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"));
                 System.out.println("result = " + result);
                 return result;
             }
@@ -582,8 +582,8 @@ public class EntityAnalyse {
             // 执行请求操作，并拿到结果（同步阻塞）
             String body = EntityUtils.toString(response.getEntity());
             JSONObject jsonObject = JSONObject.parseObject(body);
-            if ("异常".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                JSONArray jsonArray = jsonObject.getJSONObject("result").getJSONArray("validateResult");
+            if ("异常".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                JSONArray jsonArray = jsonObject.getJSONArray("result").getJSONObject(0).getJSONArray("validateResult");
                 String result = "";
                 for (int i = 0; i < jsonArray.size(); i++) {
                     if ("异常".equals(jsonArray.getJSONObject(i).getString("flag"))) {
@@ -592,12 +592,12 @@ public class EntityAnalyse {
                 }
                 System.out.println("result = " + result);
                 return result;
-            } else if ("待校验".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
+            } else if ("待校验".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
                 String result = "待校验";
                 System.out.println("result = " + result);
                 return result;
-            } else if ("通过".equals(jsonObject.getJSONObject("result").getString("validateStatus"))) {
-                String result = jsonObject.getJSONObject("result").getString("validateStatus");
+            } else if ("通过".equals(jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"))) {
+                String result = (jsonObject.getJSONArray("result").getJSONObject(0).getString("validateStatus"));
                 System.out.println("result = " + result);
                 return result;
             }