From 70b65a25b5792b6277fa6ce61df61a7399c2dcfc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 11:25:16 +0800
Subject: [PATCH] fix(mall): 修改获取字典数据的类型和代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 88 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 21 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 89ef59d..84c8072 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
@@ -1,5 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.ApiCheckTraceInfoDto;
@@ -8,17 +10,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 +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);
}
@@ -90,24 +107,53 @@
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) {
- String url = "http://open-sgp.800best.com/api-server/m9api/api/process";
- String partnerID = "71";
- String partnerKey = "G95DIM64";
- 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;
+ String state = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SENDER_STATE.getType(),
+ DataDictionaryEnum.SENDER_STATE.getCode()
+ ).getValue();
+ if(state.equals("0")){
+ return ClientParamService.getInstance(ClientParamEnum.TEST.name()).checkTraceInfo(checkTraceInfoDto);
+ }else if(state.equals("1")){
+ return ClientParamService.getInstance(ClientParamEnum.PRD.name()).checkTraceInfo(checkTraceInfoDto);
+ }else{
+ throw new FebsException("获取快递信息接口，系统配置异常");
+ }
}
}
--
Gitblit v1.9.1