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

performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java

@@ -76,8 +76,7 @@ public class TempLineWarnController {
         FeignAddressVO feignAddressVO = addressOptional.get();
 
 
-        if (feignAddressVO.getSendAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
+        if (feignAddressVO.getSendAddress()!=null){
             String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
                     feignAddressVO.getSendAddress().getLatitude());
 
@@ -85,8 +84,7 @@ public class TempLineWarnController {
             result.put("send", weather);
         }
 
-        if (feignAddressVO.getReceiveAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
+        if (feignAddressVO.getReceiveAddress()!=null){
             String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
                     feignAddressVO.getReceiveAddress().getLatitude());
             String weather = gdUtils.getWeather(cityCode);

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnWeatherWarnServiceImpl.java

@@ -70,8 +70,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
         if (addressOptional.isEmpty()) {return;}
         FeignAddressVO feignAddressVO = addressOptional.get();
 
-        if (feignAddressVO.getSendAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
+        if (feignAddressVO.getSendAddress()!=null){
             String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
                     feignAddressVO.getSendAddress().getLatitude());
 
@@ -81,8 +80,7 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
                 lineWarnCommonService.lineWarnInfoUpdate(orderGoods, lineWarnInfo, lineWarnConfig, weather);
             }
         }
-        if (feignAddressVO.getReceiveAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
+        if (feignAddressVO.getReceiveAddress()!=null){
             String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
                     feignAddressVO.getReceiveAddress().getLatitude());
             String weather = gdUtils.getWeather(cityCode);