From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/LogisticsServiceImpl.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/LogisticsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/LogisticsServiceImpl.java
index 3b26cd7..994ab03 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/LogisticsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/LogisticsServiceImpl.java
@@ -1,9 +1,9 @@
package com.ruoyi.order.service.impl;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kuaidi100.sdk.api.QueryTrack;
@@ -12,34 +12,24 @@
import com.kuaidi100.sdk.request.QueryTrackParam;
import com.kuaidi100.sdk.request.QueryTrackReq;
import com.kuaidi100.sdk.utils.SignUtils;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.mapper.LogisticsMapper;
+import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.service.ILogisticsService;
-import com.ruoyi.order.vo.KuaiDiCode;
import com.ruoyi.system.api.domain.Logistics;
import com.ruoyi.system.api.domain.dto.LogisticsDTO;
import com.ruoyi.system.api.domain.vo.Express100VO;
-import net.sf.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
/**
* <p>
@@ -53,16 +43,17 @@
public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics> implements
ILogisticsService {
- private String key="BltjQodT7186";
+ private static final String key = "BltjQodT7186";
- private String kye1="GMtjjhxp9pdEpfz37M";
- private String customer="56DE8E9E3D58CE73C60755C8B7483043";
+ private static final String kye1 = "GMtjjhxp9pdEpfz37M";
+ private static final String customer = "56DE8E9E3D58CE73C60755C8B7483043";
private static final String AUTONUMBER_AUTO_URL = "http://www.kuaidi100.com/autonumber/auto?num=NUM&key=KEY";
@Autowired
private RestTemplate restTemplate;
-
+ @Autowired
+ private OrderMapper orderMapper;
@Override
public Express100VO getLogisticsList(LogisticsDTO logisticsDTO) {
@@ -70,6 +61,11 @@
QueryTrackParam queryTrackParam = new QueryTrackParam();
queryTrackParam.setCom(logisticsDTO.getCompany());
queryTrackParam.setNum(logisticsDTO.getPostid());
+ if ((logisticsDTO.getCompany().equals("shunfeng") || logisticsDTO.getCompany()
+ .equals("shunfengkuaiyun")) && StringUtils.isNotBlank(
+ logisticsDTO.getReceiverPhone())) {
+ queryTrackParam.setPhone(logisticsDTO.getReceiverPhone());
+ }
String param = new Gson().toJson(queryTrackParam);
queryTrackReq.setParam(param);
@@ -90,7 +86,9 @@
LambdaQueryWrapper<Logistics> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Logistics::getLogisticsNum,logisticsDTO.getCompany());
Logistics one = this.getOne(wrapper);
- response.setLogisticsName(one.getLogisticsName());
+ if (Objects.nonNull(one)) {
+ response.setLogisticsName(one.getLogisticsName());
+ }
return response;
}
--
Gitblit v1.7.1