From 3af254f1b36e7722673fcebe110da524b276105c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十二月 2024 17:56:04 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java |  166 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 141 insertions(+), 25 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 645a5b9..a02e691 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
@@ -3,6 +3,8 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
 import com.doumee.core.tms.model.TMSContants;
 import com.doumee.core.tms.model.request.*;
 import com.doumee.core.tms.model.response.*;
@@ -10,6 +12,7 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.HttpsUtil;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
 import com.doumee.dao.business.dao.SmsEmailMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.third.TmsService;
@@ -190,6 +193,122 @@
     }
 
     /**
+     * 鏈畬鎴愯鍗曞垪琛ㄦ帴鍙�
+     * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public    TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param){
+        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+                    +TMSContants.InterfacePath.getNotFinishOrderList[0];
+        TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getNotFinishOrderList[1],JSONObject.toJSONString(param)
+                ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> >(){});
+        if(response ==null || response.getData() == null){
+            return  new TmsBasePageResponse<>();
+        }
+        return  response.getData();
+
+    }
+    /**
+     * 鏌ヨ鍙告満鎵�鏈変唬鍔炰换鍔�
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public    TmsBasePageResponse<TmsDriveTaskListResponse> getDriverTaskList(TmsDriverTaskListRequest param){
+        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];
+        TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
+                ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
+        if(response ==null || response.getData() == null){
+            return  new TmsBasePageResponse<>();
+        }
+        return  response.getData();
+    }
+    /**
+     * 鍙告満寰呭姙浠诲姟璇︽儏
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public    TmsDriveTaskInfoResponse getDriverTaskDetail(TmsDriverTaskInfoRequest param){
+        if(StringUtils.isBlank(param.getId()) ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        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];
+        TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
+                ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
+        if(response ==null || response.getData() == null){
+            return  new TmsDriveTaskInfoResponse();
+        }
+        return  response.getData();
+    }
+    /**
+     * 鍙告満鍚繍
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public   boolean  driverStart(TmsDriverStartAndArrivalRequest param){
+        if(StringUtils.isBlank(param.getId()) || StringUtils.isBlank(param.getOptType())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        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];
+        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")){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        return  true;
+    }
+    /**
+     * 鍙告満鍒拌揣
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public   boolean  driverArrival(TmsDriverStartAndArrivalRequest param){
+        if(StringUtils.isBlank(param.getId())
+                || StringUtils.isBlank(param.getOptType())
+                || param.getStopNumber() == null){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        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];
+        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")){
+          throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        return  true;
+    }
+    /**
+     * 鍑哄簱鑳藉姏缁熻
+     * 鏌ヨ鏌愪釜鍘�/鍏ㄩ儴鍘傜殑浠婃棩璁″垝閲忋�佷粖鏃ュ嚭搴撻噺銆佷粖鏃ユ湭鍑哄簱閲忔暟鎹��
+     * @param param 鍙傛暟
+     * @return TmsBaseResponse
+     */
+    @Override
+    public    TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param){
+        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+                    +TMSContants.InterfacePath.getOutboundCapability[0];
+        TmsBaseResponse<TmsOutboundCapabilityResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getOutboundCapability[1],JSONObject.toJSONString(param)
+                ,new TypeReference< TmsBaseResponse<TmsOutboundCapabilityResponse>>(){});
+        if(response ==null || response.getData() == null){
+            return  new TmsOutboundCapabilityResponse();
+        }
+        return  response.getData();
+    }
+    /**
      * 鍚堝悓鍒楄〃鎺ュ彛
      * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
      * @param param 鍙傛暟
@@ -197,27 +316,6 @@
      */
     @Override
     public   TmsBasePageResponse<TmsOrderListResponse>  orderList(TmsOrderListRequest param){
-        if(param == null){
-            param = new TmsOrderListRequest();
-        }
-        if(param.getParameters() == null){
-            param.setParameters( new TmsOrderListParamRequest());
-        }
-        if(param.getPager() == null){
-            param.setPager( new TmsOrderListPagerRequest());
-        }
-        if(param.getPager().getPage() == null){
-            param.getPager().setPage(1);
-        }
-        if(param.getPager().getRows() == null){
-            param.getPager().setRows(10);
-        }
-       if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
-           param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
-       }
-       if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
-           param.getParameters().setContractNumbers(null);
-       }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getOrderList[0];
         TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
@@ -265,10 +363,10 @@
     @Override
     public  List<TmsDistributionOfDeliveryLocResponse>   getDistributionOfDeliveryLocations(TmsFacrotyCodeListRequest param){
         List<TmsDistributionOfDeliveryLocResponse> result = new ArrayList<>();
-        if( param.getFacrotyCodeList() == null || param.getFacrotyCodeList().size() == 0){
-            param.setFacrotyCodeList(new ArrayList<>());
-            param.getFacrotyCodeList().add("0");
-        }
+//        if( param.getFacrotyCodeList() == null || param.getFacrotyCodeList().size() == 0){
+//            param.setFacrotyCodeList(new ArrayList<>());
+//            param.getFacrotyCodeList().add("0");
+//        }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getDistributionOfDeliveryLocations[0];
         TmsBaseResponse< List<TmsDistributionOfDeliveryLocResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getDistributionOfDeliveryLocations[1],
@@ -317,6 +415,23 @@
         return result;
     }
     /**
+     * 杩�7鏃ュ埌璐ф儏鍐�(鍚槑缁�)
+     * @return TmsBaseResponse
+     */
+    @Override
+    public  List<TmsSevenArrivalStatusAndDetailsResponse>   getSevenArrivalStatusAndDetails(TmsSevenArrivalDetailsRequest param ){
+        List<TmsSevenArrivalStatusAndDetailsResponse> result = new ArrayList<>();
+        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+                    +TMSContants.InterfacePath.getSevenArrivalStatusAndDetails[0];
+        TmsBaseResponse< List<TmsSevenArrivalStatusAndDetailsResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getSevenArrivalStatusAndDetails[1]
+                ,JSONObject.toJSONString(param)
+                ,new TypeReference< TmsBaseResponse< List<TmsSevenArrivalStatusAndDetailsResponse>>>(){});
+        if(response!=null && response.getData()!=null){
+              result =response.getData();
+        }
+        return result;
+    }
+    /**
      * 鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
      * @return TmsBaseResponse
      */
@@ -334,6 +449,7 @@
         return result;
     }
 
+
     /**
      * 鍙戣捣 tms鎺ュ彛璇锋眰
      * @param url

--
Gitblit v1.9.3