From 00a4e3cab6b4d038b2b5fbb45d816b57481bbe0f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 17 Jan 2025 15:29:23 +0800 Subject: [PATCH] refactor(mall): 修改会员密码重置功能和界面 --- src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 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 f11f2e4..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 @@ -8,6 +8,7 @@ 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; @@ -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); } @@ -92,15 +109,25 @@ @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"; - - String url = "http://sea-edi-hxtest.800best.com/Malaysia/kdapi/api/process"; - String partnerID = "M_TEST"; - String partnerKey = "TEST12345"; + /** + * 正式环境 + * 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); -- Gitblit v1.9.1