From 88419bc51de62ffe6640a4c9d48489cdbddc46a8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 19:46:00 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index d46799d..287af7d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -3,9 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
+import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
@@ -48,9 +46,29 @@
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
@LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
-
- return ApiResponse.success(tmsService.orderList(request));
+ public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody 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);
+ }
+ return ApiResponse.success(tmsService.orderList(param));
}
@ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
@LoginNoRequired
--
Gitblit v1.9.3