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/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 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 8da7117..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
@@ -6,9 +6,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
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.response.TmsBaseResponse;
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
+import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
@@ -17,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;
@@ -37,6 +42,9 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
@@ -53,36 +61,51 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private WmsInterfaceLogMapper wmsInterfaceLogMapper;
-
+ @Value("${debug_model}")
+ private Boolean isDebug;
/**
* 鐢靛瓙閿佷笂閿佹椂闂存帴鍙�
* 鏍规嵁鍚堝悓鍙凤紝鏌ヨ鐢靛瓙閿佷笂閿佹儏鍐碉紱瀛樺湪鎵归噺鏌ヨ鐨勬儏鍐碉紱
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
@Override
public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_LOCK_STATUS_URL).getCode();
- TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"鐢靛瓙閿佷笂閿佹椂闂存帴鍙�",JSONObject.toJSONString(param)
+ TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛",JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
- return new TmsBaseResponse<>();
+ return response;
}
/**
* 鍚堝悓鍒楄〃鎺ュ彛
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
@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)
,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
- return new TmsBaseResponse<>();
+ return response;
+ }
+ /**
+ * 鍚堝悓璇︽儏鎺ュ彛
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param){
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_DETAIL_URL).getCode();
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"鍚堝悓璇︽儏鎺ュ彛",JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
+ return response;
}
/**
--
Gitblit v1.9.3