From 85c8c5d02183c77eaf7169a3b1882f8d16acd783 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Sat, 11 Oct 2025 18:10:14 +0800 Subject: [PATCH] =?UTF-8?q?style(logistics):=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=A1=BA=E4=B8=B0=E6=8F=92=E4=BB=B6=E4=BB=A3=E7=A0=81-=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=86=E5=A4=9A=E4=BD=99=E7=9A=84@Componen?= =?UTF-8?q?t=E6=B3=A8=E8=A7=A3-=20=E7=BB=9F=E4=B8=80=E4=BA=86if=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E4=B8=AD=E7=9A=84=E7=A9=BA=E6=A0=BC=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=20-=20=E8=B0=83=E6=95=B4=E4=BA=86=E6=96=B9=E6=B3=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=97=B4=E7=9A=84=E7=A9=BA=E6=A0=BC=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=BA=86=E5=AF=B9=E8=B1=A1=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98=20-=20=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E4=BA=86=E5=8F=98=E9=87=8F=E5=A3=B0=E6=98=8E=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=A0=BC-=20=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B=E5=92=8C=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?-=20=E4=BF=AE=E6=AD=A3=E4=BA=86=E6=96=B9=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E7=9A=84=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20-=20=E7=BB=9F=E4=B8=80=E4=BA=86=E5=B8=83=E5=B0=94=E5=80=BC?= =?UTF-8?q?=E6=AF=94=E8=BE=83=E7=9A=84=E6=A0=BC=E5=BC=8F=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=BA=86JSON=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=A9=BA=E6=A0=BC-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=E7=9A=84=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F-=20=E4=BF=AE=E6=AD=A3=E4=BA=86sendPost=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=B8=AD=E7=9A=84=E5=B7=A5=E5=85=B7=E7=B1=BB=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/shunfeng/ShunfengPlugin.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java b/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java index 98970939f..623d410df 100644 --- a/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java +++ b/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java @@ -22,13 +22,13 @@ import com.sf.csim.express.service.HttpClientUtil; import com.sf.csim.express.service.IServiceCodeStandard; import com.sf.csim.express.service.code.ExpressServiceCodeEnum; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import java.io.UnsupportedEncodingException; import java.util.*; /** * 顺丰插件 + * * @author admin */ @Slf4j @@ -43,7 +43,8 @@ public class ShunfengPlugin implements LogisticsPlugin { **/ private LogisticsSetting logisticsSetting; - public ShunfengPlugin(){} + public ShunfengPlugin() { + } public ShunfengPlugin(LogisticsSetting logisticsSetting) { this.logisticsSetting = logisticsSetting; @@ -63,7 +64,7 @@ public class ShunfengPlugin implements LogisticsPlugin { public String createOrder(OrderDetailVO orderDetailVO) { StoreDetailService storeService = SpringContextUtil.getBean(StoreDetailService.class); StoreDeliverGoodsAddressDTO storeDeliverGoodsAddressDTO = storeService.getStoreDeliverGoodsAddressDto(orderDetailVO.getOrder().getStoreId()); - if(storeDeliverGoodsAddressDTO == null){ + if (storeDeliverGoodsAddressDTO == null) { throw new ServiceException(ResultCode.STORE_DELIVER_ADDRESS_EXIST); } try { @@ -109,7 +110,7 @@ public class ShunfengPlugin implements LogisticsPlugin { String result = sendPost(ExpressServiceCodeEnum.EXP_RECE_CREATE_ORDER, msgDataMap); JSONObject resultData = JSONUtil.parseObj(result).getJSONObject("apiResultData"); - if(Boolean.TRUE.toString().equals(resultData.get("success").toString())){ + if (Boolean.TRUE.toString().equals(resultData.get("success").toString())) { return resultData.getJSONObject("msgData").getJSONArray("waybillNoInfoList").getJSONObject(0).get("waybillNo").toString(); } throw new ServiceException(resultData.get("errorMsg").toString()); @@ -142,10 +143,10 @@ public class ShunfengPlugin implements LogisticsPlugin { msgDataMap.put("trackingNumber", trackingNumber); JSONObject result = JSONUtil.parseObj(sendPost(ExpressServiceCodeEnum.EXP_RECE_SEARCH_ROUTES, msgDataMap)); JSONObject resultData = result.getJSONObject("apiResultData"); - if(Boolean.TRUE.toString().equals(resultData.get("success").toString())){ + if (Boolean.TRUE.toString().equals(resultData.get("success").toString())) { JSONArray routesJson = resultData.getJSONObject("msgData").getJSONArray("routeResps").getJSONObject(0).getJSONArray("routes"); List routes = routesJson.toList(Map.class); - return new Traces(logistics.getName(),expNo,routes); + return new Traces(logistics.getName(), expNo, routes); } } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); @@ -165,7 +166,7 @@ public class ShunfengPlugin implements LogisticsPlugin { * @return */ @Override - public Map labelOrder(LabelOrderDTO labelOrderDTO) { + public Map labelOrder(LabelOrderDTO labelOrderDTO) { try { Map msgDataMap = new HashMap<>(); //模板编码 @@ -174,15 +175,15 @@ public class ShunfengPlugin implements LogisticsPlugin { //业务数据 Map documents = new HashMap<>(); documents.put("masterWaybillNo", labelOrderDTO.getOrder().getLogisticsNo()); - msgDataMap.put("documents",documents); - msgDataMap.put("sync",true); + msgDataMap.put("documents", documents); + msgDataMap.put("sync", true); /** * 版本号，传固定值:2.0 */ msgDataMap.put("version", "2.0"); JSONObject result = JSONUtil.parseObj(sendPost(ExpressServiceCodeEnum.COM_RECE_CLOUD_PRINT_WAYBILLS, msgDataMap)); JSONObject resultData = result.getJSONObject("apiResultData"); - if(Boolean.TRUE.toString().equals(resultData.get("success").toString())){ + if (Boolean.TRUE.toString().equals(resultData.get("success").toString())) { return resultData.getJSONObject("obj").getJSONArray("files").toList(Map.class).get(0); } throw new ServiceException(resultData.getJSONArray("errorMessage").get(0).toString()); @@ -205,13 +206,13 @@ public class ShunfengPlugin implements LogisticsPlugin { //校验类型 1，电话号码校验 2，月结卡号校验 msgDataMap.put("checkType", 1); //校验值 当校验类型为1时传电话号码 当校验类型为2时传月结卡号 - List mobileList= new ArrayList<>(); + List mobileList = new ArrayList<>(); mobileList.add(checkNos); msgDataMap.put("checkNos", mobileList); JSONObject result = JSONUtil.parseObj(sendPost(ExpressServiceCodeEnum.EXP_RECE_SEARCH_PROMITM, msgDataMap)); JSONObject resultData = result.getJSONObject("apiResultData"); - if(Boolean.TRUE.toString().equals(resultData.get("success").toString())){ - return resultData.getJSONObject("msgData").get("promiseTm").toString(); + if (Boolean.TRUE.toString().equals(resultData.get("success").toString())) { + return resultData.getJSONObject("msgData").get("promiseTm").toString(); } throw new ServiceException(resultData.get("errorMsg").toString()); } catch (UnsupportedEncodingException e) { @@ -220,7 +221,6 @@ public class ShunfengPlugin implements LogisticsPlugin { } private String sendPost(IServiceCodeStandard standardService, Map msgDataMap) throws UnsupportedEncodingException { - CallExpressServiceTools tools = CallExpressServiceTools.getInstance(); Map params = new HashMap(); String timeStamp = String.valueOf(System.currentTimeMillis()); // 顾客编码 @@ -231,7 +231,7 @@ public class ShunfengPlugin implements LogisticsPlugin { params.put("timestamp", timeStamp); params.put("msgData", JSONUtil.toJsonStr(msgDataMap)); - params.put("msgDigest", tools.getMsgDigest(params.get("msgData"), timeStamp, logisticsSetting.getCheckWord())); + params.put("msgDigest", CallExpressServiceTools.getMsgDigest(params.get("msgData"), timeStamp, logisticsSetting.getCheckWord())); String result = HttpClientUtil.post(logisticsSetting.getCallUrl(), params); log.info("===调用地址 ===" + logisticsSetting.getCallUrl());