From ffde84f1c23e432d4020ee4ad4a0461f63bc0bc7 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期日, 20 八月 2023 23:30:34 +0800
Subject: [PATCH] 管理后台：补充积分商品详情的省市和门店
---
cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java | 2 --
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 26 +++++++++++++++++++++-----
2 files changed, 21 insertions(+), 7 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 894443e..df63b48 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
@@ -10,6 +10,7 @@
import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import com.dsh.activity.feignclient.model.*;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.activity.model.PointMerchandiseVo;
import com.dsh.activity.model.request.*;
@@ -823,8 +824,18 @@
List<StoreVos> storeVos = new ArrayList<>();
List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
.eq("pointsMerchandiseId",id));
-
- // TODO: 2023/8/18 查询城市
+ if (list.size() > 0 ){
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ if (stores.size() > 0 ){
+ for (Store store : stores) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(store.getProvince() +"省"+ store.getCity() +"市");
+ storeVos1.setNum2(store.getName());
+ storeVos.add(storeVos1);
+ }
+ }
+ }
return storeVos;
}
@@ -835,9 +846,14 @@
List<StoreVos> storeVos = new ArrayList<>();
List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>()
.eq(PointsMerchandiseCity::getPointsMerchandiseId,id));
-
-
- // TODO: 2023/8/18 查询门店
+ if (list.size() > 0 ){
+ for (PointsMerchandiseCity pointsMerchandiseCity : list) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(pointsMerchandiseCity.getProvince());
+ storeVos1.setNum2(pointsMerchandiseCity.getCity());
+ storeVos.add(storeVos1);
+ }
+ }
return storeVos;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
index a11cec8..aa7ffbb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
@@ -13,6 +13,4 @@
String num1;
String num2;
-
- String num3;
}
--
Gitblit v1.7.1