From f6f097390b999e261f4369313ee6c6afa1b8c276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十二月 2024 19:37:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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 7772152..f0f2918 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
@@ -9,6 +9,7 @@
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
@@ -154,7 +155,9 @@
}
}
}
-
+ Collections.sort(list, (o1, o2) -> {
+ return o2.getKey() - o1.getKey(); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -169,19 +172,26 @@
for(TmsCircleStatusListResponse status :data){
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),t )){
status.setOrderStatusDes(TMSContants.ChildStatusLevel.getInfo(status.getOrderStatus(),null));
list.add(status);
}
+ Date td =DateUtil.fromStringToDate("yyy-MM-dd HH:mm:ss",status.getRecordDate());
+ if(td!=null){
+ status.setTimeStamp(td.getTime());
+ }
}
}
}
+ Collections.sort(list, (o1, o2) -> {
+ return (int) (o2.getTimeStamp() - o1.getTimeStamp()); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -192,21 +202,36 @@
* @return TmsBaseResponse
*/
@Override
- public List<TmsOrderListResponse> orderList(TmsOrderListRequest param){
- if(StringUtils.isBlank(param.getPhoneNumber())){
- param.setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
+ 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.getContractNumbers()==null || param.getContractNumbers().size()==0){
- param.setContractNumbers(null);
+ 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<List<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
+ TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>>>(){});
if(response ==null){
- return new ArrayList<>();
+ return new TmsBasePageResponse<>();
}else{
- return response.getData()==null?new ArrayList<>():response.getData();
+ return response.getData()==null?new TmsBasePageResponse<>():response.getData();
}
}
/**
@@ -222,7 +247,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderDetailByContractNumber[0];
- TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],JSONObject.toJSONString(param)
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],param.getContractNumber()
,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
if(response!=null && response.getData()!=null){
result =response.getData();
--
Gitblit v1.9.3