From 4616f614418bd8715b65d159239b7a6058210d63 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 27 二月 2024 18:03:59 +0800
Subject: [PATCH] 新增加接口
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
index 1568141..eb4ebef 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.HomeModule;
import com.dsh.other.entity.StoreConfig;
+import com.dsh.other.feignclient.communityWorldCup.WorldCupStoreClient;
+import com.dsh.other.feignclient.communityWorldCup.model.WorldCupStore;
import com.dsh.other.model.StoreConfigVo;
import com.dsh.other.service.IHomeModuleService;
import com.dsh.other.service.StoreConfigService;
@@ -15,6 +17,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -34,6 +37,9 @@
@Autowired
private IHomeModuleService homeModuleService;
+
+ @Resource
+ private WorldCupStoreClient worldCupStoreClient;
@@ -100,16 +106,24 @@
storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
break;
}
- case 9: {
- storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
- break;
- }
}
}
listVo.add(storeConfigVo);
}
+
+ List<WorldCupStore> worldCupStoreList = worldCupStoreClient.getWorldCupStoreList(storeId);
+ for (WorldCupStore worldCupStore : worldCupStoreList) {
+ StoreConfigVo storeConfigVo = new StoreConfigVo();
+ storeConfigVo.setId(worldCupStore.getWorldCupId());
+ storeConfigVo.setBackgroundImage(worldCupStore.getBackgroundImage());
+ storeConfigVo.setType(9);
+ storeConfigVo.setIsOpen(worldCupStore.getIsOpen());
+ listVo.add(storeConfigVo);
+ }
+
+
//排序
Collections.sort(listVo, new Comparator<StoreConfigVo>() {
@Override
--
Gitblit v1.7.1