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
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index 301b635..82848b5 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -1,14 +1,16 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.util.ToolUtil;
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;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -19,6 +21,9 @@
@Resource
private PhoneMapper phoneMapper;
+
+ @Autowired
+ private IOpenCityService openCityService;
/**
* 获取所有系统电话
@@ -27,20 +32,8 @@
*/
@Override
public List<Phone> queryPhones(String code) throws Exception {
- List<Phone> list = new ArrayList<>();
- if(ToolUtil.isNotEmpty(code)){
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
- 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);
- }
- }
- return list;
+ OpenCity openCity = openCityService.openCity1(code);
+ return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity));
}
@@ -52,23 +45,12 @@
*/
@Override
public Map<String, Object> queryCustomerPhone(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
Map<String, Object> map = new HashMap<>();
- //平台电话
- Phone query = phoneMapper.query(2, 1, null, null, null);
- map.put("platform", null != query ? query.getPhone() : "");
-
- //公司
- query = phoneMapper.query(2, 2, province, city, code);
- if(query == null){
- query = phoneMapper.query(2, 2, province, city, null);
- }
- if(query == null){
- query = phoneMapper.query(2, 2, province, null, null);
- }
- map.put("company", null != query ? query.getPhone() : "");
+ OpenCity openCity = openCityService.openCity1(code);
+ Phone phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity).eq("type", 2).eq("platform", 1));
+ map.put("platform", null != phone ? phone.getPhone() : "");
+ phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity).eq("type", 2).eq("platform", 2));
+ map.put("company", null != phone ? phone.getPhone() : "");
return map;
}
}
--
Gitblit v1.7.1