From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index 2c21a67..1c4396a 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -2,8 +2,11 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
+import com.stylefeng.guns.modular.system.model.OpenCity;
import com.stylefeng.guns.modular.system.model.Phone;
+import com.stylefeng.guns.modular.system.service.IOpenCityService;
import com.stylefeng.guns.modular.system.service.IPhoneService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -17,6 +20,8 @@
@Resource
private PhoneMapper phoneMapper;
+ @Autowired
+ private IOpenCityService openCityService;
/**
* 获取所有系统电话
@@ -25,16 +30,8 @@
*/
@Override
public List<Phone> queryPhones(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
- List<Phone> list = phoneMapper.queryPhones(province, city, code);
- if(list.size() == 0){
- list = phoneMapper.queryPhones(province, city, null);
- }
- if(list.size() == 0){
- list = phoneMapper.queryPhones(province, null, null);
- }
+ OpenCity openCity = openCityService.openCity1(code);
+ List<Phone> list = phoneMapper.queryPhones(openCity.getId());
return list;
}
@@ -47,32 +44,19 @@
*/
@Override
public Map<String, Object> queryCustomerPhone(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
+ OpenCity openCity = openCityService.openCity1(code);
+
Map<String, Object> map = new HashMap<>();
//平台电话
- Phone query = phoneMapper.query(2, 1, null, null, null);
+ Phone query = phoneMapper.queryInfo(openCity.getId(), 2, 1);
map.put("platform", null != query ? query.getPhone() : "");
//公司
- query = phoneMapper.query(2, null, province, city, code);
- if(query == null){
- query = phoneMapper.query(2, null, province, city, null);
- }
- if(query == null){
- query = phoneMapper.query(2, null, province, null, null);
- }
+ query = phoneMapper.queryInfo(openCity.getId(), 2, 2);
map.put("company", null != query ? query.getPhone() : "");
//调度电话
- query = phoneMapper.query(3, null, province, city, code);
- if(query == null){
- query = phoneMapper.query(3, null, province, city, null);
- }
- if(query == null){
- query = phoneMapper.query(3, null, province, null, null);
- }
+ query = phoneMapper.queryInfo(openCity.getId(), 3, null);
map.put("scheduling", null != query ? query.getPhone() : "");
return map;
}
--
Gitblit v1.7.1