From 0d998afc5dd5a41851e34d8b8b742e4934e6fd62 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 03 八月 2023 18:04:21 +0800
Subject: [PATCH] 修复app端加入玩湃中课程列表数据字段bug;使用福利的课时详情的记录bug

---
 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