From 88c3d89fb18415722b1f3b57cbec3d3593cc587f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 10:07:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 3 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 10 +++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java | 35 +++++++++++++++++++++++++++++++++++
6 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index d6fb18f..8024f3c 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1167,7 +1167,7 @@
;
// 鎴愬憳鍙橀噺
private int key;
- private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満
+ private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満 2璁垮
private String yw;//涓氬姟绫诲瀷
private String info;//璇存槑
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index 9ef1434..1d0949e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -20,4 +20,7 @@
private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
+ private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
+ private String code ;//鍚� 楠岃瘉鐮�
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
new file mode 100644
index 0000000..e276007
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
@@ -0,0 +1,35 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏌ヨ鍚堝悓鍒楄〃璇锋眰杩斿洖鍙傛暟")
+public class TmsContractListResponse {
+ /**
+ {
+ "code": 0,
+ "data": [
+ {
+ "fromRepertoty": "鍚堣偉鎴愬搧搴�",
+ "ncCreateDate": "2023-12-04 10:36:15",
+ "toRepertoty": "澶╂触甯備腑蹇冧粨搴�",
+ "contractNumber": "112308335",
+ "orderStatus": "鍒拌揪鍗歌揣鍦�"
+ }
+ ],
+ "message": "鎿嶄綔鎴愬姛"
+ }
+ */
+ private String contractNumber ;//鍚堝悓鍙�
+ private String fromRepertoty ;//鍙戣揣鍦�
+ private String toRepertoty ;//鍒拌揣鍦�
+ private String plateNumber ;//杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ private String orderStatus ;//褰撳墠杩愯緭鍗曠姸鎬�
+ private String ncCreateDate;// 鍒跺崟鏃堕棿
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
index 855faba..417157d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -35,4 +35,5 @@
private String ncCreateDate; // 鍒跺崟鏃堕棿
+
}
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 9a98862..4d8502e 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
@@ -19,13 +19,16 @@
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +42,9 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
@@ -55,7 +61,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private WmsInterfaceLogMapper wmsInterfaceLogMapper;
-
+ @Value("${debug_model}")
+ private Boolean isDebug;
/**
* 鐢靛瓙閿佷笂閿佹椂闂存帴鍙�
* 鏍规嵁鍚堝悓鍙凤紝鏌ヨ鐢靛瓙閿佷笂閿佹儏鍐碉紱瀛樺湪鎵归噺鏌ヨ鐨勬儏鍐碉紱
@@ -80,6 +87,7 @@
*/
@Override
public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,param.getPhoneNumber(),param.getCode());
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"鍚堝悓鍒楄〃鎺ュ彛",JSONObject.toJSONString(param)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 804ae24..f9f7949 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -35,7 +35,7 @@
/**
* 鍚堝悓鍒楄〃鎺ュ彛
- * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
+ * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠姐�佹墜鏈哄彿锛岄潪闇�瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
--
Gitblit v1.9.3