From 3d4a143874ca8371abb66888ff376408ef54ac61 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 15:12:21 +0800
Subject: [PATCH] app端的福利主页积分商城的feign返回值封装处理

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 c4b5025..92e4c4f 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
@@ -11,6 +11,7 @@
 import com.dsh.activity.feignclient.model.*;
 import com.dsh.activity.feignclient.other.StoreClient;
 import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
+import com.dsh.activity.model.PointMerchandiseVo;
 import com.dsh.activity.model.request.CommodityRequest;
 import com.dsh.activity.service.*;
 import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -90,13 +91,15 @@
     }
 
 
+    @ResponseBody
     @PostMapping("/base/pointMerchars/getCommoditys")
-    public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+    public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
+        PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
         List<PointsMerchandise> list =  new ArrayList<>();
         String provinceCode = "";
         String cityCode = "";
         if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
-            return list;
+            return pointMerchandiseVo;
         }
         try {
             Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
@@ -116,8 +119,9 @@
                     iterator.remove(); // 移除符合条件的商品
                 }
             }
+            pointMerchandiseVo.setMerchandises(list);
         }
-        return list;
+        return pointMerchandiseVo;
     }
 
     @PostMapping("/base/pointMerchars/getRedeemedNums")

--
Gitblit v1.7.1