Skip to content

C
clx-performance
提交 a2616284 authored 作者: 艾庆国's avatar 艾庆国
浏览文件
操作

Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

Former-commit-id: ba58fcb6
上级 afd173ed 64494297
隐藏空白字符变更
内嵌 并排
正在显示 包含 4 行增加 和 8 行删除
performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java
浏览文件 @ a2616284
...@@ -76,8 +76,7 @@ public class TempLineWarnController { ...@@ -76,8 +76,7 @@ public class TempLineWarnController {
FeignAddressVO feignAddressVO = addressOptional.get(); FeignAddressVO feignAddressVO = addressOptional.get();
if (feignAddressVO.getSendAddress()!=null if (feignAddressVO.getSendAddress()!=null){
&& StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(), String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
feignAddressVO.getSendAddress().getLatitude()); feignAddressVO.getSendAddress().getLatitude());
...@@ -85,8 +84,7 @@ public class TempLineWarnController { ...@@ -85,8 +84,7 @@ public class TempLineWarnController {
result.put("send", weather); result.put("send", weather);
} }
if (feignAddressVO.getReceiveAddress()!=null if (feignAddressVO.getReceiveAddress()!=null){
&& StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(), String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
feignAddressVO.getReceiveAddress().getLatitude()); feignAddressVO.getReceiveAddress().getLatitude());
String weather = gdUtils.getWeather(cityCode); String weather = gdUtils.getWeather(cityCode);
......
performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnWeatherWarnServiceImpl.java
浏览文件 @ a2616284
...@@ -70,8 +70,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic ...@@ -70,8 +70,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
if (addressOptional.isEmpty()) {return;} if (addressOptional.isEmpty()) {return;}
FeignAddressVO feignAddressVO = addressOptional.get(); FeignAddressVO feignAddressVO = addressOptional.get();
if (feignAddressVO.getSendAddress()!=null if (feignAddressVO.getSendAddress()!=null){
&& StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(), String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
feignAddressVO.getSendAddress().getLatitude()); feignAddressVO.getSendAddress().getLatitude());
...@@ -81,8 +80,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic ...@@ -81,8 +80,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
lineWarnCommonService.lineWarnInfoUpdate(orderGoods, lineWarnInfo, lineWarnConfig, weather); lineWarnCommonService.lineWarnInfoUpdate(orderGoods, lineWarnInfo, lineWarnConfig, weather);
} }
} }
if (feignAddressVO.getReceiveAddress()!=null if (feignAddressVO.getReceiveAddress()!=null){
&& StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(), String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
feignAddressVO.getReceiveAddress().getLatitude()); feignAddressVO.getReceiveAddress().getLatitude());
String weather = gdUtils.getWeather(cityCode); String weather = gdUtils.getWeather(cityCode);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论