From 63921852e92b9a452f1cc8147227fbd82f466c7e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 May 2024 15:07:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=20no=20=20null=20=E7=BB=8F=E7=BA=AC=E5=BA=A6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/CommonController.java | 4 ++-- .../system/cashierservice/service/ProductService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java index eaa73c4..eaf0c2b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java @@ -101,10 +101,10 @@ public class CommonController { @GetMapping("location/geocode") public Result geocode(@RequestParam String lat, @RequestParam String lng) { String address="108.939645,34.343207"; - if (StringUtils.isBlank(lat) || StringUtils.isBlank(lng)) { + if (!StringUtils.isBlank(lat) && !StringUtils.isBlank(lng)) { address=lng + "," + lat; } - return Result.success(CodeEnum.SUCCESS, LocationUtils.geocode(lng + "," + lat)); + return Result.success(CodeEnum.SUCCESS, LocationUtils.geocode(address)); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 74eb42c..d31e44b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -179,7 +179,7 @@ public class ProductService { homeDto.getAddress(), homeDto.getOrderBy().toString(), homeDto.getLng(), homeDto.getLat()); } if (CollectionUtils.isEmpty(shopGroupInfoVos)) { - return new PageInfo(); + return new PageInfo(shopGroupInfoVos); } List productIds = shopGroupInfoVos.stream().map(ShopGroupInfoVo::getProId).collect(Collectors.toList()); List stringList = productIds.stream()