From 52401d48013a422dab5d45d976f89e01472abc79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 03 一月 2025 16:39:53 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index a02e691..9132ddb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -168,6 +168,10 @@
             for(Integer t :statusList){
                 for(TmsCircleStatusListResponse status :data){
                     if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
+                            && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.rggx)) {
+                         continue;
+                    }
+                    if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
                             && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
                         status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
                     }
@@ -220,7 +224,7 @@
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getDriverTaskList[0];
 
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
         TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
         if(response ==null || response.getData() == null){
@@ -241,7 +245,7 @@
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getDriverTaskDetail[0];
 
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
         if(response ==null || response.getData() == null){
@@ -261,10 +265,10 @@
         }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.driverStart[0];
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
-        if(response ==null || response.getData() == null || !StringUtils.equals(response.getCode(),"0")){
+        if(response ==null ||   !StringUtils.equals(response.getCode(),"0")){
             throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
         }
         return  true;
@@ -283,10 +287,10 @@
         }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.driverArrival[0];
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
-        if(response ==null || response.getData() == null ||!StringUtils.equals(response.getCode(),"0")){
+        if(response ==null  ||!StringUtils.equals(response.getCode(),"0")){
           throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
         }
         return  true;

--
Gitblit v1.9.3