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 | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 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 c669e28..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
@@ -8,17 +8,16 @@
import cc.mrbird.febs.mall.mapper.AppVersionMapper;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.service.ICommonService;
+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;
/**
@@ -53,6 +52,22 @@
@Override
public List<DataDictionaryCustom> findDataDicByType(String type) {
+ List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(type);
+ if(type.equals("KEFU_SET")){
+ if(CollUtil.isEmpty(dataDictionaryCustoms)){
+ DataDictionaryCustom dataDictionaryCustom = new DataDictionaryCustom();
+ dataDictionaryCustom.setType(type);
+ dataDictionaryCustom.setCode("WEIXIN");
+ dataDictionaryCustom.setDescription("微信客服");
+ dataDictionaryCustomMapper.insert(dataDictionaryCustom);
+ DataDictionaryCustom dataDictionaryCustom2 = new DataDictionaryCustom();
+ dataDictionaryCustom2.setType(type);
+ dataDictionaryCustom2.setCode("WHATSAPP");
+ dataDictionaryCustom2.setDescription("WhatsApp客服");
+ dataDictionaryCustomMapper.insert(dataDictionaryCustom2);
+ }
+ }
+
return dataDictionaryCustomMapper.selectDicByType(type);
}
@@ -90,40 +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/proces";
- String url = "http://open-sgp.800best.com/api-server/m9api/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