From ceb1ff4dd962198868e63e659f1d96ea4052be25 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 07 八月 2023 14:11:54 +0800
Subject: [PATCH] app端：用户头像上传接口字段变更；管理后台优惠券添加的内容
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index b0d9bb4..cb9957e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -92,8 +92,12 @@
@PostMapping("/base/pointMerchars/getCommoditys")
public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
String cityCode = "";
+ if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
+ return list;
+ }
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
provinceCode = geocode.get("provinceCode");
@@ -102,7 +106,7 @@
e.printStackTrace();
}
- List<PointsMerchandise> list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
+ list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
--
Gitblit v1.7.1