From 37e34bbbb9f1838481c41a7848a2185a30f5617e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 08 Feb 2025 16:48:23 +0800
Subject: [PATCH] refactor(pay): 重构 FiuuReturnController 中的 skey 计算逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 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 4f4cd2f..b890d8d 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
@@ -2,17 +2,24 @@
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.dto.ApiCheckTraceInfoDto;
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
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.kdTraceQuery.response.KdTraceQueryRsp;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -47,6 +54,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);
}
@@ -83,4 +106,40 @@
dic.setDescription(description);
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/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;
+ }
}
--
Gitblit v1.9.1