From e15c348bc992de7331d14d76451032358aae9289 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 09 Jan 2025 15:44:14 +0800
Subject: [PATCH] feat(mall): 商品列表增加活动筛选功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 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 6f2fe47..08902f7 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,6 +2,7 @@
 
 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;
@@ -9,10 +10,15 @@
 import cc.mrbird.febs.mall.service.ICommonService;
 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;
 
 /**
@@ -57,9 +63,19 @@
 
     @Override
     public void addDataDic(String type, String code, Object value, String description) {
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        addDataDic(type, code, value, description, true);
+    }
 
-        String data = JSONObject.toJSONString(value);
+    @Override
+    public void addDataDic(String type, String code, Object value, String description, boolean isJson) {
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        String data = null;
+        if (isJson) {
+            data = JSONObject.toJSONString(value);
+        } else {
+            data = (String) value;
+        }
+
         if (dic != null) {
             dic.setValue(data);
             dataDictionaryCustomMapper.updateById(dic);
@@ -73,4 +89,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