From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index af742a4..a3db1d2 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
+import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.Phone;
+import com.stylefeng.guns.modular.system.service.ICompanyCityService;
import com.stylefeng.guns.modular.system.service.IPhoneService;
import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
@@ -15,6 +17,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
@@ -25,6 +28,9 @@
@Resource
private RedisUtil redisUtil;
+
+ @Resource
+ private ICompanyCityService companyCityService;
@@ -46,7 +52,9 @@
for (int i = 0; i < addressComponentsVos.length; i++) {
city[i] = addressComponentsVos[i].getLongName();
}
- List<Phone> list = phoneMapper.queryPhones(city);
+ List<Company> companies = companyCityService.query2(city);
+ List<Integer> collect = companies.stream().map(Company::getId).collect(Collectors.toList());
+ List<Phone> list = phoneMapper.queryPhones(collect);
return list;
}
@@ -70,11 +78,12 @@
}
Map<String, Object> map = new HashMap<>();
//平台电话
- Phone query = phoneMapper.query(2, 1, city);
+ Phone query = phoneMapper.query(2, 1, null);
map.put("platform", null != query ? query.getPhone() : "");
-
+
+ Company company = companyCityService.query1(city);
//公司
- query = phoneMapper.query(2, 2, city);
+ query = phoneMapper.query(2, 2, company.getId());
map.put("company", null != query ? query.getPhone() : "");
return map;
}
--
Gitblit v1.7.1