From e8f8d89a4248cd4d0a7138cc2e5a36ea9b136699 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 11 Feb 2025 17:03:01 +0800 Subject: [PATCH] feat(mall): 添加订单一键发货和取消发货功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 74 +++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java index b890d8d..d70d969 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java @@ -11,15 +11,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.best.javaSdk.Client; -import com.best.javaSdk.kdTraceQuery.request.KdTraceQueryReq; -import com.best.javaSdk.kdTraceQuery.request.MailNos; +import com.best.javaSdk.ClientParamEnum; +import com.best.javaSdk.ClientParamService; import com.best.javaSdk.kdTraceQuery.response.KdTraceQueryRsp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -107,39 +105,43 @@ dataDictionaryCustomMapper.insert(dic); } +// @Override +// public KdTraceQueryRsp checkTraceInfo(ApiCheckTraceInfoDto checkTraceInfoDto) { +// /** +// * 正式环境 +// * MY_LEADING 生产环境参数 +// * partnerID : MY_LEADING +// * partnerKey : ER5DFRT320D4ed6FAFs3G410Fs977 +// * Endpoint :http://sgp-seaedi.800best.com/Malaysia/kdapi/api/process +// */ +// String url = "http://sgp-seaedi.800best.com/Malaysia/kdapi/api/process"; +// String partnerID = "MY_LEADING"; +// String partnerKey = "ER5DFRT320D4ed6FAFs3G410Fs977"; +// String format = "JSON"; +// /** +// * 测试环境 +// * 测试物流编号 66660451238000 +// */ +//// String url = "http://sea-edi-hxtest.800best.com/Malaysia/kdapi/api/process"; +//// String partnerID = "M_TEST"; +//// String partnerKey = "TEST12345"; +//// String format = "JSON"; +// +// Client client = new Client(url, partnerID, partnerKey, format); +// +// KdTraceQueryReq tdTraceQueryReq = new KdTraceQueryReq(); +// MailNos mailNos = new MailNos(); +// List<String> mailNo = new ArrayList<>(); +// mailNo.add(checkTraceInfoDto.getTraceNo()); +// mailNos.setMailNo(mailNo); +// tdTraceQueryReq.setMailNos(mailNos); +// tdTraceQueryReq.setLangType("zh-CN"); +// +// KdTraceQueryRsp kdTraceQueryRsp = client.executed(tdTraceQueryReq); +// return kdTraceQueryRsp; +// } @Override public KdTraceQueryRsp checkTraceInfo(ApiCheckTraceInfoDto checkTraceInfoDto) { - /** - * 正式环境 - * MY_LEADING 生产环境参数 - * partnerID : MY_LEADING - * partnerKey : ER5DFRT320D4ed6FAFs3G410Fs977 - * Endpoint :http://sgp-seaedi.800best.com/Malaysia/kdapi/api/proces - */ - String url = "http://sgp-seaedi.800best.com/Malaysia/kdapi/api/process"; - String partnerID = "MY_LEADING"; - String partnerKey = "ER5DFRT320D4ed6FAFs3G410Fs977"; - String format = "JSON"; - /** - * 测试环境 - * 测试物流编号 66660451238000 - */ -// String url = "http://sea-edi-hxtest.800best.com/Malaysia/kdapi/api/process"; -// String partnerID = "M_TEST"; -// String partnerKey = "TEST12345"; -// String format = "JSON"; - - Client client = new Client(url, partnerID, partnerKey, format); - - KdTraceQueryReq tdTraceQueryReq = new KdTraceQueryReq(); - MailNos mailNos = new MailNos(); - List<String> mailNo = new ArrayList<>(); - mailNo.add(checkTraceInfoDto.getTraceNo()); - mailNos.setMailNo(mailNo); - tdTraceQueryReq.setMailNos(mailNos); - tdTraceQueryReq.setLangType("zh-CN"); - - KdTraceQueryRsp kdTraceQueryRsp = client.executed(tdTraceQueryReq); - return kdTraceQueryRsp; + return ClientParamService.getInstance(ClientParamEnum.PRD.name()).checkTraceInfo(checkTraceInfoDto); } } -- Gitblit v1.9.1